* Added weechat and updated xfce-terminal and vte. (From Graeme

  Caldwell <graemercaldwell@gmail.com>.)

svn path=/nixpkgs/trunk/; revision=22965

5 files changed, 27 insertions, 6 deletions

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
new file mode 100644
index 00000000000..a9cf07a0b12
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}:
+
+stdenv.mkDerivation {
+  name = "weechat-0.3.2";
+
+  src = fetchurl {
+    url = http://weechat.org/files/src/weechat-0.3.2.tar.gz;
+    sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc";
+  };
+
+  buildInputs = [ncurses perl python openssl aspell];
+
+  meta = {
+    homepage = http://http://www.weechat.org/;
+    description = "A fast, light and extensible chat client";
+  };
+}
+     
diff --git a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
index 0dc4161ba5a..b0f72ca7bbf 100644
--- a/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/vte/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses,
   pythonSupport ? false, python}:
 stdenv.mkDerivation rec {
-  name = "vte-0.22.5";
+  name = "vte-0.25.1";
   src = fetchurl {
-    url = "mirror://gnome/desktop/2.28/2.28.2/sources/${name}.tar.bz2";
-    sha256 = "1xmjlz79z3apxmq18d5qyliaky6xb1n2nxwvpzrdl4ky6hk73660";
+    url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.25/${name}.tar.bz2";
+    sha256 = "105f5ifyg09nh5p6fw2w7c0n9wd8vw9cvwlh6zg49ibsar893qi5";
   };
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
                 stdenv.lib.optional pythonSupport python;
diff --git a/pkgs/desktops/xfce-4/applications/terminal/default.nix b/pkgs/desktops/xfce-4/applications/terminal/default.nix
index 8a05d999fc1..85f1aa21136 100644
--- a/pkgs/desktops/xfce-4/applications/terminal/default.nix
+++ b/pkgs/desktops/xfce-4/applications/terminal/default.nix
@@ -6,10 +6,10 @@
 }:
 
 stdenv.mkDerivation {
-  name = "xfce-terminal-0.4.4";
+  name = "xfce-terminal-0.4.5";
   src = fetchurl {
-    url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.4.tar.bz2;
-    sha256 = "1cmkrzgi2j5dgb1jigdqigf7fa84hh9l2bclgxzn17168cwpd1lw";
+    url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
+    sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
   };
 
   buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb77636c494..d6bb4a4b6a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6192,6 +6192,8 @@ let
     graphicsSupport = false;
   };
 
+  weechat = callPackage ../applications/networking/irc/weechat { };
+
   wings = callPackage ../applications/graphics/wings { };
 
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b02e244ffeb..e99c37eb771 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -329,6 +329,7 @@ with (import ./release-lib.nix);
   vsftpd = linux;
   w3m = all;
   webkit = linux;
+  weechat = linux;
   wget = all;
   which = all;
   wicd = linux;