dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "python3: pin to openssl_1_1"

Browse Source 
This reverts commit 8dfc998207.
This commit is contained in:
ajs124 2022-10-20 11:55:20 +02:00
parent 4d30c4aaea
commit 017fd89527
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/python/cpython/default.nix
View File

@ -7,7 +7,6 @@
, mailcap, mimetypesSupport ? true , mailcap, mimetypesSupport ? true
, ncurses , ncurses
, openssl , openssl
, openssl_1_1
, readline , readline
, sqlite , sqlite
, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false
@ -77,10 +76,6 @@ assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode))
with lib; with lib;
let let
# cpython does support/build with openssl 3.0, but some libraries using the ssl module seem to have issues with it
# null check for Minimal
openssl' = if openssl != null then openssl_1_1 else null;
buildPackages = pkgsBuildHost; buildPackages = pkgsBuildHost;
inherit (passthru) pythonForBuild; inherit (passthru) pythonForBuild;
@ -121,7 +116,7 @@ let
]; ];
buildInputs = filter (p: p != null) ([ buildInputs = filter (p: p != null) ([
zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl' ] zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ]
++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals x11Support [ tcl tk libX11 xorgproto ]
++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ]
++ optionals stdenv.isDarwin [ configd ]) ++ optionals stdenv.isDarwin [ configd ])
@ -327,8 +322,8 @@ in with passthru; stdenv.mkDerivation {
"--with-threads" "--with-threads"
] ++ optionals (sqlite != null && isPy3k) [ ] ++ optionals (sqlite != null && isPy3k) [
"--enable-loadable-sqlite-extensions" "--enable-loadable-sqlite-extensions"
] ++ optionals (openssl' != null) [ ] ++ optionals (openssl != null) [
"--with-openssl=${openssl'.dev}" "--with-openssl=${openssl.dev}"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_buggy_getaddrinfo=no" "ac_cv_buggy_getaddrinfo=no"
# Assume little-endian IEEE 754 floating point when cross compiling # Assume little-endian IEEE 754 floating point when cross compiling
@ -493,7 +488,7 @@ in with passthru; stdenv.mkDerivation {
# Enforce that we don't have references to the OpenSSL -dev package, which we # Enforce that we don't have references to the OpenSSL -dev package, which we
# explicitly specify in our configure flags above. # explicitly specify in our configure flags above.
disallowedReferences = disallowedReferences =
lib.optionals (openssl' != null && !static) [ openssl'.dev ] lib.optionals (openssl != null && !static) [ openssl.dev ]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Ensure we don't have references to build-time packages. # Ensure we don't have references to build-time packages.
# These typically end up in shebangs. # These typically end up in shebangs.