From 0051c0a4a506f5b21e5923a873fbc91a107e1300 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 14 Sep 2020 12:16:49 -0700 Subject: [PATCH] pythonPackages.bcrypt: use 3.1.x for python older than 3.6 --- .../development/python-modules/bcrypt/3_1.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/bcrypt/3_1.nix diff --git a/pkgs/development/python-modules/bcrypt/3_1.nix b/pkgs/development/python-modules/bcrypt/3_1.nix new file mode 100644 index 00000000000000..c70161cf28b068 --- /dev/null +++ b/pkgs/development/python-modules/bcrypt/3_1.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi +, isPyPy, cffi, pytest, six }: + +buildPythonPackage rec { + version = "3.1.7"; + pname = "bcrypt"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; + }; + + checkInputs = [ pytest ]; + + propagatedBuildInputs = [ six ] ++ lib.optional (!isPyPy) cffi; + + meta = with lib; { + description = "Modern password hashing for your software and your servers"; + homepage = "https://github.com/pyca/bcrypt/"; + license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b837acff87847b..593ac2c88d9ad6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -778,7 +778,10 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = callPackage ../development/python-modules/bcrypt { }; + bcrypt = if pythonOlder "3.6" then + callPackage ../development/python-modules/bcrypt/3_1.nix { } + else + callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { };