BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Apply r32435 from the trunk (always build Python with SSL support).

Browse source 
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
This commit is contained in:
Eelco Dolstra 2012-02-21 23:35:35 +00:00
parent e64443baf1
commit f71dd91a43
12 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/p2p/tribler/default.nix
View file

@ -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
];

2
pkgs/applications/version-management/bazaar/default.nix
View file

@ -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

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

@ -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

2
pkgs/applications/virtualization/nova/client.nix
View file

@ -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 ];

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

@ -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 ];

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

@ -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\"";

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

@ -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 = {

5
pkgs/tools/networking/p2p/bit-tornado/default.nix
View file

@ -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 = ''

2
pkgs/tools/networking/s3cmd/default.nix
View file

@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
pythonPath = [ pythonPackages.ssl ];
installPhase =
''
python setup.py install --prefix=$out

2
pkgs/tools/virtualization/euca2ools/default.nix
View file

@ -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 =
''

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

@ -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
};

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

@ -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";