Merge pull request #34826 from va1entin/pynacl

pythonPackages.pynacl: 0.3.0 -> 1.2.1

lib/maintainers.nix

@@ -715,6 +715,7 @@
   utdemir = "Utku Demir <me@utdemir.com>";
   #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
+  va1entin = "Valentin Heidelberger <github@valentinsblog.com>";
   vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
   valeriangalliat = "Valérian Galliat <val@codejam.info>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";

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;
+  };
+}

pkgs/top-level/python-packages.nix

@@ -19960,23 +19960,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 { };