alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Modified the Python 2.7 expression so that the interpreter has unconditional

Browse source 
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
This commit is contained in:
Peter Simons 2012-02-20 18:52:52 +00:00
parent 3a414e0292
commit 95cbf4ed55
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip { stdenv, fetchurl, python, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null, ssl, curses }: , guiSupport ? false, tk ? null, curses }:
let let
name = "mercurial-2.0.2"; name = "mercurial-2.0.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
inherit python; # pass it so that the same version can be used in hg2git inherit python; # pass it so that the same version can be used in hg2git
pythonPackages = [ ssl curses ]; pythonPackages = [ curses ];
buildInputs = [ python makeWrapper docutils unzip ]; buildInputs = [ python makeWrapper docutils unzip ];
@ -35,7 +35,7 @@ stdenv.mkDerivation {
'' ''
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 ${ssl} ${curses}")" \ --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \
$WRAP_TK $WRAP_TK
done done

7
pkgs/development/interpreters/python/2.7/default.nix
View file

@ -38,7 +38,7 @@ let
buildInputs = buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 ] [ bzip2 openssl ]
++ optional zlibSupport zlib ++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
@ -172,11 +172,6 @@ let
deps = [ sqlite ]; deps = [ sqlite ];
}; };
ssl = buildInternalPythonModule {
moduleName = "ssl";
deps = [ openssl ];
};
tkinter = buildInternalPythonModule { tkinter = buildInternalPythonModule {
moduleName = "tkinter"; moduleName = "tkinter";
deps = [ tcl tk x11 ]; deps = [ tcl tk x11 ];

4
pkgs/tools/networking/offlineimap/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, buildPythonPackage, ssl }: { fetchurl, buildPythonPackage }:
buildPythonPackage { buildPythonPackage {
name = "offlineimap-6.2.0.2"; name = "offlineimap-6.2.0.2";
@ -8,8 +8,6 @@ buildPythonPackage {
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
}; };
propagatedBuildInputs = [ ssl ];
doCheck = false; doCheck = false;
meta = { meta = {

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

@ -1110,9 +1110,7 @@ let
odt2txt = callPackage ../tools/text/odt2txt { }; odt2txt = callPackage ../tools/text/odt2txt { };
offlineimap = callPackage ../tools/networking/offlineimap { offlineimap = callPackage ../tools/networking/offlineimap { };
ssl = pythonPackages.ssl;
};
opendbx = callPackage ../development/libraries/opendbx { }; opendbx = callPackage ../development/libraries/opendbx { };
@ -7185,7 +7183,7 @@ let
}; };
mercurial = callPackage ../applications/version-management/mercurial { mercurial = callPackage ../applications/version-management/mercurial {
inherit (pythonPackages) ssl curses; inherit (pythonPackages) curses;
guiSupport = false; # use mercurialFull to get hgk GUI guiSupport = false; # use mercurialFull to get hgk GUI
}; };