Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions pkgs/development/python-modules/bcrypt/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
rustPlatform,
rustc,
setuptools,
setuptoolsRustBuildHook,
fetchPypi,
pythonOlder,
setuptools-rust,
fetchFromGitHub,
pytestCheckHook,
libiconv,
stdenv,
# for passthru.tests
asyncssh,
django_4,
Expand All @@ -21,14 +18,14 @@

buildPythonPackage rec {
pname = "bcrypt";
version = "4.3.0";
format = "pyproject";
version = "5.0.0";
pyproject = true;

disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg=";
src = fetchFromGitHub {
owner = "pyca";
repo = "bcrypt";
tag = version;
hash = "sha256-7Dp07xoq6h+fiP7d7/TRRoYszWsyQF1c4vuFUpZ7u6U=";
};

cargoRoot = "src/_bcrypt";
Expand All @@ -39,20 +36,20 @@ buildPythonPackage rec {
src
cargoRoot
;
hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
hash = "sha256-hYMJlwxnXA0ZOJiyZ8rDp9govVcc1SGkDfqUVngnUPQ=";
};

nativeBuildInputs = [
build-system = [
setuptools
setuptoolsRustBuildHook
setuptools-rust
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke cross. The hook is needed to setup cross correctly

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed via #467741

];

nativeBuildInputs = [
rustPlatform.cargoSetupHook
cargo
rustc
];

# Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands.
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;

nativeCheckInputs = [ pytestCheckHook ];

pythonImportsCheck = [ "bcrypt" ];
Expand All @@ -67,10 +64,11 @@ buildPythonPackage rec {
;
};

meta = with lib; {
meta = {
changelog = "https://github.com/pyca/bcrypt/blob/${src.tag}/CHANGELOG.rst";
description = "Modern password hashing for your software and your servers";
homepage = "https://github.com/pyca/bcrypt/";
license = licenses.asl20;
maintainers = [ ];
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.dotlambda ];
};
}
9 changes: 9 additions & 0 deletions pkgs/development/python-modules/libpass/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ buildPythonPackage rec {

pythonImportsCheck = [ "passlib" ];

disabledTestPaths = [
# https://github.com/notypecheck/passlib/issues/18
"tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_70_hashes"
"tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_77_fuzz_input"
"tests/test_handlers_django.py::django_bcrypt_test::test_77_fuzz_input"
"tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_secret_w_truncate_size"
"tests/test_handlers_django.py::django_bcrypt_test::test_secret_w_truncate_size"
];

disabledTests = [
# timming sensitive
"test_dummy_verify"
Expand Down
Loading