cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #196906 from helsinki-systems/feat/less-openssl_1_1

Browse source
This commit is contained in:
Lassulus 2022-11-11 00:21:52 +01:00 committed by GitHub
commit 15a42961b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 14 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.

7
pkgs/development/libraries/cyrus-sasl/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext { lib, stdenv, fetchurl, fetchpatch, openssl, openldap, libkrb5, db, gettext
, pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false
, buildPackages, pruneLibtoolFiles, nixosTests }: , buildPackages, pruneLibtoolFiles, nixosTests }:
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
patches = [ patches = [
# Fix cross-compilation # Fix cross-compilation
./cyrus-sasl-ac-try-run-fix.patch ./cyrus-sasl-ac-try-run-fix.patch
# make compatible with openssl3. can probably be dropped with any release after 2.1.28
(fetchpatch {
url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...c2bd3afbca57f176d8c650670ce371444bb7fcc0.patch";
hash = "sha256-bYeIkvle1Ms7Lnoob4eLd4RbPFHtPkKRZvfHNCBJY/s=";
})
]; ];
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];

2
pkgs/development/libraries/openldap/default.nix
View file

@ -92,6 +92,8 @@ stdenv.mkDerivation rec {
preCheck = '' preCheck = ''
substituteInPlace tests/scripts/all \ substituteInPlace tests/scripts/all \
--replace "/bin/rm" "rm" --replace "/bin/rm" "rm"
# fails saying "SASL(-1): generic failure: internal error: failed to init cipher 'rc4'"
rm tests/scripts/test076-authid-rewrite
''; '';
doCheck = true; doCheck = true;

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

@ -18533,7 +18533,6 @@ with pkgs;
cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5; libkrb5 = if stdenv.isFreeBSD then libheimdal else libkrb5;
openssl = openssl_1_1;
}; };
# Make bdb5 the default as it is the last release under the custom # Make bdb5 the default as it is the last release under the custom
@ -21632,9 +21631,7 @@ with pkgs;
openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
openldap = callPackage ../development/libraries/openldap { openldap = callPackage ../development/libraries/openldap { };
openssl = openssl_1_1;
};
opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;