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

python: get rid of ssl module as it's always builtin

Browse source
This commit is contained in:
Domen Kožar 2014-10-11 20:23:41 +02:00
parent f310d73ac1
commit 482779e582
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/interpreters/python/2.6/default.nix
View file

@ -178,8 +178,6 @@ let
deps = [ sqlite ]; deps = [ sqlite ];
}; };
ssl = null;
tkinter = buildInternalPythonModule { tkinter = buildInternalPythonModule {
moduleName = "tkinter"; moduleName = "tkinter";
deps = [ tcl tk x11 ]; deps = [ tcl tk x11 ];

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

@ -192,8 +192,6 @@ let
deps = [ sqlite ]; deps = [ sqlite ];
}; };
ssl = null;
tkinter = buildInternalPythonModule { tkinter = buildInternalPythonModule {
moduleName = "tkinter"; moduleName = "tkinter";
deps = [ tcl tk x11 libX11 ]; deps = [ tcl tk x11 libX11 ];

2
pkgs/tools/misc/venus/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = "python runtests.py"; checkPhase = "python runtests.py";
buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt buildInputs = [ python python.modules.bsddb libxslt
libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ];
installPhase = '' installPhase = ''

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

@ -23,7 +23,6 @@ let
sqlite3 = null; sqlite3 = null;
curses = null; curses = null;
curses_panel = null; curses_panel = null;
ssl = null;
crypt = null; crypt = null;
}; };
@ -1040,7 +1039,7 @@ let
# rev = "refs/tags/0.9.3"; # rev = "refs/tags/0.9.3";
# }; # };
# #
# propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ]; # propagatedBuildInputs = [ pythonPackages.argparse ];
# #
# doCheck = false; # doCheck = false;
# #
@ -9367,7 +9366,7 @@ let
md5 = "8437607c0cc00c35f658f972516ffb55"; md5 = "8437607c0cc00c35f658f972516ffb55";
}; };
propagatedBuildInputs = [ nose modules.ssl ]; propagatedBuildInputs = [ nose ];
meta = { meta = {
description = "WSGI request and response object"; description = "WSGI request and response object";