From 05f95c69c5d31949f14aa2af612f208069c4dea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 5 Sep 2011 08:31:49 +0000
Subject: [PATCH] Updating meld

svn path=/nixpkgs/trunk/; revision=29016
---
 pkgs/applications/version-management/meld/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d131841618e..4775a419fd1 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
+{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }:
 
 let
   minor = "1.5";
-  version = "${minor}.1";
+  version = "${minor}.2";
 in
 
 stdenv.mkDerivation {
   name = "meld-${version}";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2";
-    sha256 = "0ykj3rb5hvcr4dmc52mz8q3iknrsh042v1x7yvffgs6yibakcac2";
+    url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
+    sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
   };
 
-  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];
+  buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ];
 
   patchPhase = ''
     sed -e s,/usr/local,$out, -i INSTALL