From 858a96035c023f2710e9b3a4015e0c7999498fcd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:07:58 +0200 Subject: [PATCH] python3.pkgs.rsa: 4.0 -> 4.1 keep python2 at 4.0 --- pkgs/development/python-modules/rsa/4_0.nix | 33 +++++++++++++++++++ .../python-modules/rsa/default.nix | 4 +++ pkgs/top-level/python-packages.nix | 5 ++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/rsa/4_0.nix diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix new file mode 100644 index 00000000000..459ca043796 --- /dev/null +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, unittest2 +, pyasn1 +, mock +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rsa"; + version = "4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487"; + }; + + checkInputs = [ unittest2 mock ]; + propagatedBuildInputs = [ pyasn1 ]; + + preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' + substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" + ''; + + meta = with stdenv.lib; { + homepage = "https://stuvel.eu/rsa"; + license = licenses.asl20; + description = "A pure-Python RSA implementation"; + }; + +} diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 76b4582787a..cedb852deef 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -6,6 +6,7 @@ , mock , isPy3k , pythonOlder +, poetry }: buildPythonPackage rec { @@ -24,6 +25,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76067f7559f..9d3c597184f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6174,7 +6174,10 @@ in { rpyc = callPackage ../development/python-modules/rpyc { }; - rsa = callPackage ../development/python-modules/rsa { }; + rsa = if isPy3k then + callPackage ../development/python-modules/rsa { } + else + callPackage ../development/python-modules/rsa/4_0.nix { }; squaremap = callPackage ../development/python-modules/squaremap { };