summary refs log tree commit diff
path: root/pkgs/applications/version-management/mercurial/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/version-management/mercurial/default.nix')
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix15
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index e263d7556c0b..8d4a45a496c4 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils
+{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
 , guiSupport ? false, tk ? null, ssl, curses }:
 
-stdenv.mkDerivation rec {
-  name = "mercurial-1.9.2";
+let
+  name = "mercurial-2.0";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa";
+    sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ ssl curses ];
 
-  buildInputs = [ python makeWrapper docutils ];
+  buildInputs = [ python makeWrapper docutils unzip ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -42,6 +45,8 @@ stdenv.mkDerivation rec {
       chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
+  doCheck = false;  # The test suite fails, unfortunately. Not sure why.
+
   meta = {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = http://www.selenic.com/mercurial/;