mercurial: Update to 2.6.1

Also, set a default for web.cacerts so that the system certificates on
NixOS are used.

4 files changed, 13 insertions, 7 deletions

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 865033ae2d26..669aa5713a08 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -2,14 +2,15 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.2.3";
+  name = "mercurial-2.6.1";
 in
+
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw";
+    sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
@@ -39,6 +40,12 @@ stdenv.mkDerivation {
           $WRAP_TK
       done
 
+      mkdir -p $out/etc/mercurial
+      cat >> $out/etc/mercurial/hgrc << EOF
+      [web]
+      cacerts = /etc/ssl/certs/ca-bundle.crt
+      EOF
+
       # copy hgweb.cgi to allow use in apache
       mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
@@ -49,5 +56,6 @@ stdenv.mkDerivation {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = "http://www.selenic.com/mercurial/";
     license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5052a41a96cf..3280df09dd54 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -130,7 +130,7 @@ rec {
 
 
   /* Common platform groups on which to test packages. */
-  inherit (pkgs.lib.platforms) linux darwin cygwin allBut all mesaPlatforms;
+  inherit (pkgs.lib.platforms) unix linux darwin cygwin allBut all mesaPlatforms;
 
   /* Platform groups for specific kinds of applications. */
   x11Supported = linux;
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index ba9b20c99de7..4b5bad0761d0 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1141,8 +1141,6 @@ in
   mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  mercurial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  mercurialFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2f0319854e86..f7c2ac399a43 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -197,8 +197,8 @@ let
       mcabber = linux;
       mcron = linux;
       mdadm = linux;
-      mercurial = allBut "i686-cygwin";
-      mercurialFull = allBut "i686-cygwin";
+      mercurial = unix;
+      mercurialFull = linux;
       mesa = mesaPlatforms;
       midori = linux;
       mingetty = linux;