From 9d49bdee7818b5a4773c64faf2fcef47b4a879e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Mar 2011 11:47:55 +0000 Subject: [PATCH] =?UTF-8?q?*=20Mercurial=20updated=20to=201.7.5=20(contrib?= =?UTF-8?q?uted=20by=20Vladim=C3=ADr=20=C4=8Cun=C3=A1t).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/trunk/; revision=26488 --- .../version-management/mercurial/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f3d18036d079..cee9770d7322 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, python, makeWrapper +{ stdenv, fetchurl, python, makeWrapper, docutils , guiSupport ? false, tk ? null }: stdenv.mkDerivation rec { - name = "mercurial-1.6.4"; - + name = "mercurial-1.7.5"; + src = fetchurl { url = "http://www.selenic.com/mercurial/release/${name}.tar.gz"; - sha256 = "04c8vj942ys71dn0bjga33i0qi5hybjjhq087xd0jp29ijzxp3hy"; + sha256 = "14849n52vladjmzp0s3nc8q31rkjxswg7l2f2v3j7a9h7n4czbfz"; }; inherit python; # pass it so that the same version can be used in hg2git - buildInputs = [ python makeWrapper ]; - + buildInputs = [ python makeWrapper docutils ]; + makeFlags = "PREFIX=$(out)"; - + postInstall = (stdenv.lib.optionalString guiSupport '' ensureDir $out/etc/mercurial