Merge remote-tracking branch 'NixOS/master' into staging

This commit is contained in:
Matthew Bauer
2019-01-27 00:01:13 -05:00
403 changed files with 4759 additions and 3164 deletions

View File

@@ -1,6 +1,4 @@
{ buildPythonPackage
, fetchPypi
}:
{ buildPythonPackage, fetchPypi, lib }:
buildPythonPackage rec {
# also bump cryptography
@@ -14,4 +12,12 @@ buildPythonPackage rec {
# No tests included
doCheck = false;
meta = with lib; {
description = "Test vectors for the cryptography package";
homepage = https://cryptography.io/en/latest/development/test-vectors/;
# Source: https://github.com/pyca/cryptography/tree/master/vectors;
license = with licenses; [ asl20 bsd3 ];
maintainers = with maintainers; [ primeos ];
};
}