diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-01-20 22:07:49 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-01-20 22:07:49 +0000 |
commit | 594c0a8ff9f9689360fbb4719e503cf5ea316ad4 (patch) | |
tree | 5460a86dbfe92d10b7b47d03050872d6e65b8ee6 /pkgs/applications/version-management/meld | |
parent | 72a6bbc02c15ff3a327c885d811bf316f0d4355e (diff) |
Updating meld (patch by Carles Pagès)
svn path=/nixpkgs/trunk/; revision=25647
Diffstat (limited to 'pkgs/applications/version-management/meld')
-rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 9a4c58d11c48..e39a1b6f22ad 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,18 +1,23 @@ {stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: +let + minor = "1.5"; + version = "${minor}.0"; +in + stdenv.mkDerivation { - name = "meld-1.3.1"; + name = "meld-${version}"; src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.1.tar.bz2; - sha256 = "0iqnj3qb9l7z12akgmf64fr2xqirsqxflvj60xqcqr5vd5c763nn"; + url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.bz2"; + sha256 = "1kf0k3813nfmahn2l2lbs6n9zg2902gixypsf656m6mqyyrmxrrm"; }; buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; patchPhase = '' sed -e s,/usr/local,$out, -i INSTALL - sed -e 's,#!.*,#!${python}/bin/python,' -i meld + sed -e 's,#!.*,#!${python}/bin/python,' -i bin/meld ''; postInstall = '' |