diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:35:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-21 23:35:35 +0000 |
| commit | f71dd91a438f8777c90b3df27b1509d2508e580d (patch) | |
| tree | 1e932d8502e3b168d2970cd44faddfc9e39c3567 /pkgs/tools/networking | |
| parent | e64443baf1f78b62ebd4db5354b348bd3a280c01 (diff) | |
| download | nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.gz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.bz2 nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.lz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.xz nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.tar.zst nixlib-f71dd91a438f8777c90b3df27b1509d2508e580d.zip | |
* Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit. svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/getmail/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/offlineimap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/bit-tornado/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/s3cmd/default.nix | 2 |
4 files changed, 4 insertions, 11 deletions
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 |