summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-09-05 08:31:49 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-09-05 08:31:49 +0000
commit05f95c69c5d31949f14aa2af612f208069c4dea6 (patch)
tree21bf5cfb4cb3f35ff8f5256582dad79996ebfbbe /pkgs/applications
parent7f6a997831f5fefd6269e76326c162f993446172 (diff)
downloadnixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar.gz
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar.bz2
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar.lz
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar.xz
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.tar.zst
nixlib-05f95c69c5d31949f14aa2af612f208069c4dea6.zip
Updating meld
svn path=/nixpkgs/trunk/; revision=29016
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/version-management/meld/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index d131841618ec..4775a419fd14 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