diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:00:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:16:54 +0200 |
| commit | 1e389c976cc5326b08bd166785e643364bb2d8b4 (patch) | |
| tree | 58f51874e758fb2f6412f1d15717a5cfe1a8fb01 /pkgs/development/interpreters/python | |
| parent | a8fc68a5c02488a2228a1dc4984a3fa6351002eb (diff) | |
| parent | 773595540bd3a52476a7c84799e374d086d1c648 (diff) | |
| download | nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.gz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.bz2 nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.lz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.xz nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.tar.zst nixlib-1e389c976cc5326b08bd166785e643364bb2d8b4.zip | |
merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 940b667e86a8..64e21b755691 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -30,7 +30,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + [ bzip2 openssl ] ++ optional zlibSupport zlib; @@ -178,10 +178,7 @@ let deps = [ sqlite ]; }; - ssl = buildInternalPythonModule { - moduleName = "ssl"; - deps = [ openssl ]; - }; + ssl = null; tkinter = buildInternalPythonModule { moduleName = "tkinter"; |