diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-02-20 12:56:14 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-02-20 12:56:14 +0200 |
| commit | d15432ca9e9359b865aac63ae47863e94bbce0e4 (patch) | |
| tree | be4e6f52cb8e31f5b5fad637c95c0a730ea76081 /gnu/packages/messaging.scm | |
| parent | def971689052ebc3e0a68684328c28cac35b8596 (diff) | |
| parent | 3b254d76132627ff62ac5571f4175669164624c5 (diff) | |
| download | guix-d15432ca9e9359b865aac63ae47863e94bbce0e4.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/messaging.scm')
| -rw-r--r-- | gnu/packages/messaging.scm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index af44da5a1f..9345e24263 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 <contact.ng0@cryptolab.net> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> @@ -446,7 +446,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.") (define-public gajim (package (name "gajim") - (version "0.16.6") + (version "0.16.7") (source (origin (method url-fetch) (uri (string-append "https://gajim.org/downloads/" @@ -454,7 +454,7 @@ was initially a fork of xmpppy, but is using non-blocking sockets.") "/gajim-" version ".tar.bz2")) (sha256 (base32 - "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk")))) + "13sxz0hpvyj2yvcbsfqq9yn0hp1d1zsxsj40r0v16jlibha5da9n")))) (build-system gnu-build-system) (arguments `(#:phases @@ -477,12 +477,11 @@ was initially a fork of xmpppy, but is using non-blocking sockets.") #t))))) (native-inputs `(("intltool" ,intltool))) - (propagated-inputs + (inputs `(("python2-nbxmpp" ,python2-nbxmpp) ("python2-pyopenssl" ,python2-pyopenssl) - ("python2-gnupg" ,python2-gnupg))) - (inputs - `(("python2-pygtk" ,python2-pygtk) + ("python2-gnupg" ,python2-gnupg) + ("python2-pygtk" ,python2-pygtk) ("python" ,python-2))) (home-page "https://gajim.org/") (synopsis "Jabber (XMPP) client") @@ -1140,7 +1139,7 @@ protocol allows.") (define-public mcabber (package (name "mcabber") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -1148,7 +1147,7 @@ protocol allows.") name "-" version ".tar.bz2")) (sha256 (base32 - "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3")))) + "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list "--enable-otr" |