@@ -5,9 +5,9 @@
55, pkgsStatic
66, openssl
77, invoke
8−, pytest
98, tls-parser
109, cacert
10+, pytestCheckHook
1111}:
1212
1313let
@@ -36,17 +36,16 @@ let
3636 opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs (
3737 oldAttrs: rec {
3838 name = "openssl-${version}";
39− version = "1.1.1";
39+ version = "1.1.1h";
4040 src = fetchurl {
4141 url = "https://www.openssl.org/source/${name}.tar.gz";
42− sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
42+ sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
4343 };
4444 configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
4545 "enable-weak-ssl-ciphers"
4646 "enable-tls1_3"
4747 "no-async"
4848 ];
49− patches = [ ./nix-ssl-cert-file.patch ];
5049 buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
5150 }
5251 );
@@ -68,32 +67,36 @@ let
6867in
6968buildPythonPackage rec {
7069 pname = "nassl";
71− version = "3.0.0";
70+ version = "3.1.0";
7271
7372 src = fetchFromGitHub {
7473 owner = "nabla-c0d3";
7574 repo = pname;
7675 rev = version;
77− sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z";
76+ sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci";
7877 };
7978
80− postPatch = ''
81− mkdir -p deps/openssl-OpenSSL_1_0_2e/
79+ postPatch = let
80+ legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version;
81+ modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version;
82+ zlibVersion = zlibStatic.version;
83+ in ''
84+ mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
8285 cp ${opensslLegacyStatic.out}/lib/libssl.a \
8386 ${opensslLegacyStatic.out}/lib/libcrypto.a \
84− deps/openssl-OpenSSL_1_0_2e/
85− ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include
86− ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps
87+ deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
88+ ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
89+ ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
8790
88− mkdir -p deps/openssl-OpenSSL_1_1_1/
91+ mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
8992 cp ${opensslStatic.out}/lib/libssl.a \
9093 ${opensslStatic.out}/lib/libcrypto.a \
91− deps/openssl-OpenSSL_1_1_1/
92− ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include
93− ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps
94+ deps/openssl-OpenSSL_${modernOpenSSLVersion}/
95+ ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
96+ ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
9497
95− mkdir -p deps/zlib-1.2.11/
96− cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/
98+ mkdir -p deps/zlib-${zlibVersion}/
99+ cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
97100 '';
98101
99102 propagatedBuildInputs = [ tls-parser ];
@@ -105,7 +108,7 @@ buildPythonPackage rec {
105108 invoke package.wheel
106109 '';
107110
108− checkInputs = [ pytest ];
111+ checkInputs = [ pytestCheckHook ];
109112
110113 checkPhase = ''
111114 # Skip online tests