Author: simons
Date: Mon Feb 20 18:52:52 2012
New Revision: 32435
URL: https://nixos.org/websvn/nix/?rev=32435&sc=1
Log:
Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Mon Feb 20 18:20:12 2012 (r32434)
+++ nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Mon Feb 20 18:52:52 2012 (r32435)
@@ -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 @@
};
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 @@
''
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
Modified: nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Feb
20 18:20:12 2012 (r32434)
+++ nixpkgs/trunk/pkgs/development/interpreters/python/2.7/default.nix Mon Feb
20 18:52:52 2012 (r32435)
@@ -38,7 +38,7 @@
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 @@
deps = [ sqlite ];
};
- ssl = buildInternalPythonModule {
- moduleName = "ssl";
- deps = [ openssl ];
- };
-
tkinter = buildInternalPythonModule {
moduleName = "tkinter";
deps = [ tcl tk x11 ];
Modified: nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix Mon Feb 20
18:20:12 2012 (r32434)
+++ nixpkgs/trunk/pkgs/tools/networking/offlineimap/default.nix Mon Feb 20
18:52:52 2012 (r32435)
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage, ssl }:
+{ fetchurl, buildPythonPackage }:
buildPythonPackage {
name = "offlineimap-6.2.0.2";
@@ -8,8 +8,6 @@
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
};
- propagatedBuildInputs = [ ssl ];
-
doCheck = false;
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 20 18:20:12
2012 (r32434)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Feb 20 18:52:52
2012 (r32435)
@@ -1110,9 +1110,7 @@
odt2txt = callPackage ../tools/text/odt2txt { };
- offlineimap = callPackage ../tools/networking/offlineimap {
- ssl = pythonPackages.ssl;
- };
+ offlineimap = callPackage ../tools/networking/offlineimap { };
opendbx = callPackage ../development/libraries/opendbx { };
@@ -7185,7 +7183,7 @@
};
mercurial = callPackage ../applications/version-management/mercurial {
- inherit (pythonPackages) ssl curses;
+ inherit (pythonPackages) curses;
guiSupport = false; # use mercurialFull to get hgk GUI
};
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
