From 577f4d83251b6e89628e3d20f1ac5e4bb082383b Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 11 Jan 2010 13:25:05 +0000 Subject: [PATCH] update to 2.6.5, also add python dependency for extensions and all that svn path=/nixpkgs/trunk/; revision=19352 --- .../networking/instant-messengers/pidgin/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 99461a97762..380509a875e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -14,17 +14,17 @@ GStreamer, gstPluginsBase, startupnotification, gettext, perl, perlXMLParser, libxml2, nss, nspr, farsight2, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn - , lib + , lib, python , openssl ? null , gnutls ? null , voice ? null } : stdenv.mkDerivation { - name = "pidgin-2.6.4"; + name = "pidgin-2.6.5"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2; - sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s"; + url = mirror://sourceforge/pidgin/pidgin-2.6.5.tar.bz2; + sha256 = "03ix5w1dr1hl98qh1jmp5dgv2i8f9bd39sim3rcpk9pwjd09wi9w"; }; inherit nss ncurses; @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ (lib.optional (gnutls != null) gnutls) ++ [nss nspr farsight2 - libXScrnSaver ncurses + libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a752044b260..4ee765b8cba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7431,7 +7431,7 @@ let }; pidgin = import ../applications/networking/instant-messengers/pidgin { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2 + inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2 python gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn; openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;