summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Pierron <nicolas.b.pierron@gmail.com>2009-11-14 20:14:09 +0000
committerNicolas Pierron <nicolas.b.pierron@gmail.com>2009-11-14 20:14:09 +0000
commit47de42835afe2b401c18f6c803100af28c5e176b (patch)
tree863d65c5b0d37e5e191e575991cbea25ac0cb800
parentf26614bb789cf4099beb8dfd7d1c9627cb09a4fd (diff)
downloadnixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar.gz
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar.bz2
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar.lz
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar.xz
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.tar.zst
nixpkgs-47de42835afe2b401c18f6c803100af28c5e176b.zip
* Add https support for mercurial.
svn path=/nixpkgs/trunk/; revision=18345
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd8d1968ec5..75e017c7151 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7265,8 +7265,12 @@ let
   };
 
   mercurial = import ../applications/version-management/mercurial {
-    inherit fetchurl stdenv python makeWrapper getConfig tk;
+    inherit fetchurl stdenv makeWrapper getConfig tk;
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
+    python = # allow cloning sources from https servers.
+      if getConfig ["mercurial" "httpsSupport"] true
+      then pythonFull
+      else pythonBase;
   };
 
   meshlab = import ../applications/graphics/meshlab {