mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

* Mercurial: always build with HTTPS support.

Browse source 
svn path=/nixpkgs/branches/modular-python/; revision=25395
This commit is contained in:
Eelco Dolstra 2011-01-04 16:44:38 +00:00
parent e4bfdb2da9
commit 9d792e7316
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/version-management/mercurial/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper { stdenv, fetchurl, python, makeWrapper
, guiSupport ? false, tk ? null }: , guiSupport ? false, tk ? null, ssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mercurial-1.6.4"; name = "mercurial-1.6.4";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
'' ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \ wrapProgram $out/bin/$i \
--prefix PYTHONPATH : "$(toPythonPath $out)" \ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
$WRAP_TK $WRAP_TK
done done

5
pkgs/top-level/all-packages.nix
View file

@ -6194,10 +6194,7 @@ let
mercurial = callPackage ../applications/version-management/mercurial { mercurial = callPackage ../applications/version-management/mercurial {
guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg) guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
python = # allow cloning sources from https servers. inherit (python27Modules) ssl;
if getConfig ["mercurial" "httpsSupport"] true
then pythonFull
else pythonBase;
}; };
merkaartor = callPackage ../applications/misc/merkaartor { merkaartor = callPackage ../applications/misc/merkaartor {