Author: viric
Date: Thu Jan 20 22:07:49 2011
New Revision: 25647
URL: https://svn.nixos.org/websvn/nix/?rev=25647&sc=1
Log:
Updating meld (patch by Carles Pagès)
Modified:
nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix
Modified: nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix Thu Jan
20 22:06:35 2011 (r25646)
+++ nixpkgs/trunk/pkgs/applications/version-management/meld/default.nix Thu Jan
20 22:07:49 2011 (r25647)
@@ -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 = ''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
