public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development/python-modules: stdenv.lib -> lib

Browse Source
This commit is contained in:
Pavol Rusnak
2021-01-24 01:29:22 +01:00
parent 2f34b4b883
commit a4bbfba80d
211 changed files with 525 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/python-modules/pyopenssl/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, openssl
@@ -13,9 +14,6 @@
, fetchpatch
}:
with stdenv.lib;
let
# https://github.com/pyca/pyopenssl/issues/791
# These tests, we disable in the case that libressl is passed in as openssl.
@@ -51,21 +49,20 @@ let
# https://github.com/pyca/pyopenssl/issues/768
"test_wantWriteError"
] ++ (
optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests
) ++ (
optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
) ++ (
# https://github.com/pyca/pyopenssl/issues/974
optionals stdenv.is32bit [ "test_verify_with_time" ]
lib.optionals stdenv.is32bit [ "test_verify_with_time" ]
);
# Compose the final string expression, including the "-k" and the single quotes.
testExpression = optionalString (disabledTests != [])
"-k 'not ${concatStringsSep " and not " disabledTests}'";
testExpression = lib.optionalString (disabledTests != [])
"-k 'not ${lib.concatStringsSep " and not " disabledTests}'";
in
buildPythonPackage rec {
pname = "pyOpenSSL";
version = "20.0.0";