summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/gajim/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/gajim/default.nix')
-rw-r--r--pkgs/applications/networking/instant-messengers/gajim/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index d5902d14359..fbd9954d3aa 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk
-, ldns, pyopenssl, pythonDBus, pythonPackages
+, ldns, pythonDBus, pythonPackages
 
 , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
 ,                      libnice ? null
@@ -22,21 +22,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.15.4";
+  version = "0.16.1";
 
   src = fetchurl {
-    url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz";
-    sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g";
+    url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
+    sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6";
   };
 
   patches = [
     (fetchurl {
-      name = "gajim-drill-srv.patch";
-      url = "https://projects.archlinux.org/svntogit/packages.git/"
-          + "plain/trunk/gajim-drill.patch?h=packages/gajim";
-      sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w";
-    })
-    (fetchurl {
       name = "gajim-icon-index.patch";
       url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb";
       sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv";
@@ -69,7 +63,8 @@ stdenv.mkDerivation rec {
     pythonPackages.pygobject pythonPackages.pyGtkGlade
     pythonPackages.sqlite3 pythonPackages.pyasn1
     pythonPackages.pyxdg
-    pyopenssl pythonDBus
+    pythonPackages.nbxmpp
+    pythonPackages.pyopenssl pythonDBus
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
@@ -88,5 +83,7 @@ stdenv.mkDerivation rec {
     description = "Jabber client written in PyGTK";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.raskin maintainers.aszlig ];
+    downloadPage = "http://gajim.org/downloads.php";
+    updateWalker = true;
   };
 }