Merge pull request #29069 from teto/keyring

keyring: 8.4.1 -> 10.4.0

pkgs/development/python-modules/keyring/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, secretstorage
+, fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm
+, mock, pytest_28, pytestrunner }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "keyring";
+  version = "10.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
+  };
+
+  buildInputs = [
+    fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm
+  ];
+
+  checkInputs = [ mock pytest_28 pytestrunner ];
+
+  propagatedBuildInputs = [ secretstorage ];
+
+  checkPhase = ''
+    py.test $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Store and access your passwords safely";
+    homepage    = "https://pypi.python.org/pypi/keyring";
+    license     = licenses.psfl;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+}

pkgs/top-level/python-packages.nix

@@ -11190,29 +11190,7 @@ in {
     };
   };
 
-  keyring = buildPythonPackage rec {
+  keyring = callPackage ../development/python-modules/keyring { };
-    name = "keyring-8.4.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keyring/${name}.tar.gz";
-      sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
-    };
-
-    buildInputs = with self;
-      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
-
-    checkPhase = ''
-      py.test $out
-    '';
-
-    meta = {
-      description = "Store and access your passwords safely";
-      homepage    = "https://pypi.python.org/pypi/keyring";
-      license     = licenses.psfl;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-  };
 
   klaus = buildPythonPackage rec {
     version = "0.9.1";