Author: eelco
Date: Tue Jan 4 16:44:38 2011
New Revision: 25395
URL: https://svn.nixos.org/websvn/nix/?rev=25395&sc=1
Log:
* Mercurial: always build with HTTPS support.
Modified:
nixpkgs/branches/modular-python/pkgs/applications/version-management/mercurial/default.nix
nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/modular-python/pkgs/applications/version-management/mercurial/default.nix
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/applications/version-management/mercurial/default.nix
Tue Jan 4 16:30:54 2011 (r25394)
+++
nixpkgs/branches/modular-python/pkgs/applications/version-management/mercurial/default.nix
Tue Jan 4 16:44:38 2011 (r25395)
@@ -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 @@
''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
- --prefix PYTHONPATH : "$(toPythonPath $out)" \
+ --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl}")" \
$WRAP_TK
done
Modified: nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Tue Jan
4 16:30:54 2011 (r25394)
+++ nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Tue Jan
4 16:44:38 2011 (r25395)
@@ -6194,10 +6194,7 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
