b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python310Packages.nassl: 4.0.1 -> 4.0.2

Browse source
This commit is contained in:
Fabian Affolter 2022-03-16 15:10:10 +01:00
parent 87f7b66498
commit efc16fc9db
1 changed files with 56 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
pkgs/development/python-modules/nassl/default.nix
View file

@ -9,6 +9,7 @@
, tls-parser , tls-parser
, cacert , cacert
, pytestCheckHook , pytestCheckHook
, pythonAtLeast
, pythonOlder , pythonOlder
}: }:
@ -50,9 +51,11 @@ let
"enable-tls1_3" "enable-tls1_3"
"no-async" "no-async"
]; ];
patches = builtins.filter ( patches = builtins.filter
p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" (
) oldAttrs.patches; p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
)
oldAttrs.patches;
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
meta = oldAttrs.meta // { meta = oldAttrs.meta // {
knownVulnerabilities = [ knownVulnerabilities = [
@ -76,9 +79,11 @@ let
sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
}; };
configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
patches = builtins.filter ( patches = builtins.filter
p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" (
) oldAttrs.patches; p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
)
oldAttrs.patches;
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
# openssl_1_0_2 needs `withDocs = false` # openssl_1_0_2 needs `withDocs = false`
outputs = lib.remove "doc" oldAttrs.outputs; outputs = lib.remove "doc" oldAttrs.outputs;
@ -87,42 +92,54 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "nassl"; pname = "nassl";
version = "4.0.1"; version = "4.0.2";
format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nabla-c0d3"; owner = "nabla-c0d3";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";
}; };
postPatch = let postPatch =
legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; let
modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
zlibVersion = zlibStatic.version; modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
in '' zlibVersion = zlibStatic.version;
mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ in
cp ${opensslLegacyStatic.out}/lib/libssl.a \ ''
${opensslLegacyStatic.out}/lib/libcrypto.a \ mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ cp ${opensslLegacyStatic.out}/lib/libssl.a \
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include ${opensslLegacyStatic.out}/lib/libcrypto.a \
ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
cp ${opensslStatic.out}/lib/libssl.a \ cp ${opensslStatic.out}/lib/libssl.a \
${opensslStatic.out}/lib/libcrypto.a \ ${opensslStatic.out}/lib/libcrypto.a \
deps/openssl-OpenSSL_${modernOpenSSLVersion}/ deps/openssl-OpenSSL_${modernOpenSSLVersion}/
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
mkdir -p deps/zlib-${zlibVersion}/ mkdir -p deps/zlib-${zlibVersion}/
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
''; '';
propagatedBuildInputs = [ tls-parser ]; nativeBuildInputs = [
invoke
];
nativeBuildInputs = [ invoke ]; propagatedBuildInputs = [
tls-parser
];
checkInputs = [
pytestCheckHook
];
buildPhase = '' buildPhase = ''
invoke build.nassl invoke build.nassl
@ -131,19 +148,23 @@ buildPythonPackage rec {
doCheck = true; doCheck = true;
pythonImportsCheck = [ "nassl" ]; pythonImportsCheck = [
"nassl"
checkInputs = [ pytestCheckHook ]; ];
disabledTests = [ disabledTests = [
"Online" "Online"
] ++ lib.optionals (pythonAtLeast "3.10") [
"test_write_bad"
"test_client_authentication_no_certificate_supplied"
"test_client_authentication_succeeds"
]; ];
meta = with lib; { meta = with lib; {
description = "Low-level OpenSSL wrapper for Python";
homepage = "https://github.com/nabla-c0d3/nassl"; homepage = "https://github.com/nabla-c0d3/nassl";
description = "Low-level OpenSSL wrapper for Python 3.7+";
platforms = with platforms; linux ++ darwin;
license = licenses.agpl3Only; license = licenses.agpl3Only;
maintainers = with maintainers; [ veehaitch ]; maintainers = with maintainers; [ veehaitch ];
platforms = with platforms; linux ++ darwin;
}; };
} }