diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 4e02eb9f1e6a..a834c443bf78 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; pythonPath = - [ pythonPackages.wxPython pythonPackages.ssl pythonPackages.curses pythonPackages.apsw + [ pythonPackages.wxPython pythonPackages.curses pythonPackages.apsw pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3 ]; diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 8eb28ea04c73..462aede3b1c7 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; # Readline support is needed by bzrtools. - pythonPath = [ pythonPackages.ssl pythonPackages.readline ]; + pythonPath = [ pythonPackages.readline ]; installPhase = '' python setup.py install --prefix=$out diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8381196196e5..19c7c0e9f910 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, docutils, unzip -, guiSupport ? false, tk ? null, ssl, curses }: +, guiSupport ? false, tk ? null, curses }: let 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 - pythonPackages = [ ssl curses ]; + pythonPackages = [ curses ]; buildInputs = [ python makeWrapper docutils unzip ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \ $WRAP_TK done diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix index 84858c416c88..a05466f6b45e 100644 --- a/pkgs/applications/virtualization/nova/client.nix +++ b/pkgs/applications/virtualization/nova/client.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { md5 = "c4be4adf371d1a84ce1581af365a53d0"; }; - pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ]; + pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 ]; buildInputs = [ pythonPackages.mock pythonPackages.nose ]; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 1c8ae0cf171a..635d50dc5b3e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -38,7 +38,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + [ bzip2 openssl ] ++ optional zlibSupport zlib ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; @@ -172,11 +172,6 @@ let deps = [ sqlite ]; }; - ssl = buildInternalPythonModule { - moduleName = "ssl"; - deps = [ openssl ]; - }; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 23fe3ad36740..147a9673abf6 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { name = "getmail-4.20.0"; @@ -9,8 +9,6 @@ buildPythonPackage rec { sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; }; - pythonPath = [ pythonPackages.ssl ]; - doCheck = false; installCommand = "python setup.py install --prefix=\"\$prefix\""; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 8f0dd8e9a6cb..007c8f7c6e07 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, ssl }: +{ fetchurl, buildPythonPackage }: buildPythonPackage { name = "offlineimap-6.2.0.2"; @@ -8,8 +8,6 @@ buildPythonPackage { sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; }; - propagatedBuildInputs = [ ssl ]; - doCheck = false; meta = { diff --git a/pkgs/tools/networking/p2p/bit-tornado/default.nix b/pkgs/tools/networking/p2p/bit-tornado/default.nix index 52f4e0d7138b..14e13a17559f 100644 --- a/pkgs/tools/networking/p2p/bit-tornado/default.nix +++ b/pkgs/tools/networking/p2p/bit-tornado/default.nix @@ -1,5 +1,4 @@ -{stdenv,fetchurl,python, wxPython, makeWrapper, - ssl}: +{ stdenv,fetchurl,python, wxPython, makeWrapper }: stdenv.mkDerivation { name = "bit-tornado-0.3.18"; @@ -8,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr"; }; - buildInputs = [python wxPython makeWrapper ssl]; + buildInputs = [ python wxPython makeWrapper ]; buildPhase = '' ''; installPhase = '' diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 4b12ce4c5986..83a8b4cafef0 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.ssl ]; - installPhase = '' python setup.py install --prefix=$out diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index b82f7de1b2a9..7992ced6d0cc 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ]; # We need boto 1.9 for now. See https://bugs.launchpad.net/euca2ools/devel/+bug/623888 - pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto pythonPackages.ssl ]; + pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ]; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99e565bb00aa..ddaf60985a55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -458,9 +458,7 @@ let gui = true; }; - bittornado = callPackage ../tools/networking/p2p/bit-tornado { - inherit (pythonPackages) ssl; - }; + bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; blueman = callPackage ../tools/bluetooth/blueman { inherit (pythonPackages) notify; @@ -1110,9 +1108,7 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { - ssl = pythonPackages.ssl; - }; + offlineimap = callPackage ../tools/networking/offlineimap { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -7005,7 +7001,7 @@ let }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) ssl curses; + inherit (pythonPackages) curses; guiSupport = false; # use mercurialFull to get hgk GUI }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f912ce4abb0..ec80fd58a025 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -554,7 +554,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ nose mox ]; - propagatedBuildInputs = [ gflags sqlalchemy webob routes eventlet python.modules.ssl ]; + propagatedBuildInputs = [ gflags sqlalchemy webob routes eventlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache";