diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-04 16:44:38 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-01-04 16:44:38 +0000 |
| commit | 9d792e731675c489e760da5322494e8456cbcd8c (patch) | |
| tree | 518a1010d16a085a5227c46c4cd3b41b8387c570 | |
| parent | e4bfdb2da96852bcfe72181b5438d5047e835b93 (diff) | |
| download | nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar.gz nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar.bz2 nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar.lz nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar.xz nixlib-9d792e731675c489e760da5322494e8456cbcd8c.tar.zst nixlib-9d792e731675c489e760da5322494e8456cbcd8c.zip | |
* Mercurial: always build with HTTPS support.
svn path=/nixpkgs/branches/modular-python/; revision=25395
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index f3d18036d079..061ed596030e 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper -, guiSupport ? false, tk ? null }: +, guiSupport ? false, tk ? null, ssl }: stdenv.mkDerivation rec { name = "mercurial-1.6.4"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath $out)" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \ $WRAP_TK done diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe32e9049728..4810ebb4fb63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6194,10 +6194,7 @@ let mercurial = callPackage ../applications/version-management/mercurial { 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; + inherit (python27Modules) ssl; }; merkaartor = callPackage ../applications/misc/merkaartor { |