From 97982f264af99367030152d5fc6bb2b1a8b15905 Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger Date: Sun, 11 Feb 2018 00:01:48 +0100 Subject: [PATCH] pythonPackages.pynacl: 0.3.0 -> 1.2.1 --- lib/maintainers.nix | 1 + .../python-modules/pynacl/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------- 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/pynacl/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ba5ee757a7c..39e0d544623 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -702,6 +702,7 @@ utdemir = "Utku Demir "; #urkud = "Yury G. Kudryashov "; inactive since 2012 uwap = "uwap "; + va1entin = "Valentin Heidelberger "; vaibhavsagar = "Vaibhav Sagar "; valeriangalliat = "Valérian Galliat "; vandenoever = "Jos van den Oever "; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix new file mode 100644 index 00000000000..249945b0358 --- /dev/null +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}: + +buildPythonPackage rec { + pname = "pynacl"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "pyca"; + repo = pname; + rev = version; + sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f"; + }; + + #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370 + prePatch = '' + sed -i 's/deadline=1500, //' tests/test_pwhash.py + sed -i 's/deadline=1500, //' tests/test_aead.py + ''; + + checkInputs = [ pytest coverage hypothesis ]; + propagatedBuildInputs = [ libsodium cffi six ]; + + checkPhase = '' + coverage run --source nacl --branch -m pytest + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ va1entin ]; + description = "Python binding to the Networking and Cryptography (NaCl) library"; + homepage = https://github.com/pyca/pynacl/; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9b0a61d884..0eda59ceac2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20342,23 +20342,7 @@ EOF propagatedBuildInputs = with self; [ pynacl six ]; }; - pynacl = buildPythonPackage rec { - name = "pynacl-${version}"; - version = "0.3.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyNaCl/PyNaCl-0.3.0.tar.gz"; - sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j"; - }; - - buildInputs = with self; [ pytest coverage ]; - propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser]; - - checkPhase = '' - coverage run --source nacl --branch -m pytest - ''; - - }; + pynacl = callPackage ../development/python-modules/pynacl { }; service-identity = callPackage ../development/python-modules/service_identity { };