From a8dca7bf8aeb8e803fe2305ce0f9b493fcfefdde Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 7 Sep 2017 10:16:04 +0200
Subject: [PATCH 1/2] keyring: 8.4.1 -> 10.4.0
---
pkgs/top-level/python-packages.nix | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d029cbf7ad..803e8fcfe32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11191,16 +11191,19 @@ in {
};
keyring = buildPythonPackage rec {
- name = "keyring-8.4.1";
+ name = "keyring-${version}";
+ version = "10.4.0";
src = pkgs.fetchurl {
url = "mirror://pypi/k/keyring/${name}.tar.gz";
- sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
+ sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
};
buildInputs = with self;
[ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
+ propagatedBuildInputs = [ self.secretstorage ];
+
checkPhase = ''
py.test $out
'';
From 37d3a4425e21d5734a37ca93ad2a0a7dfdc29c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Sep 2017 09:54:07 +0100
Subject: [PATCH 2/2] python.pkgs.keyring: move out of python-packages.nix
---
.../python-modules/keyring/default.nix | 35 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 31 ++--------------
2 files changed, 38 insertions(+), 28 deletions(-)
create mode 100644 pkgs/development/python-modules/keyring/default.nix
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
new file mode 100644
index 00000000000..35bfd603f41
--- /dev/null
+++ b/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;
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 803e8fcfe32..5ab25a2cbb1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11190,32 +11190,7 @@ in {
};
};
- keyring = buildPythonPackage rec {
- name = "keyring-${version}";
- version = "10.4.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/k/keyring/${name}.tar.gz";
- sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh";
- };
-
- buildInputs = with self;
- [ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
-
- propagatedBuildInputs = [ self.secretstorage ];
-
- 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;
- };
- };
+ keyring = callPackage ../development/python-modules/keyring { };
klaus = buildPythonPackage rec {
version = "0.9.1";
@@ -27487,7 +27462,7 @@ EOF
preshed = callPackage ../development/python-modules/preshed { };
- backports_weakref = callPackage ../development/python-modules/backports_weakref { };
+ backports_weakref = callPackage ../development/python-modules/backports_weakref { };
thinc = callPackage ../development/python-modules/thinc { };
@@ -27496,7 +27471,7 @@ EOF
behave = callPackage ../development/python-modules/behave { };
pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
-
+
parse = callPackage ../development/python-modules/parse { };
parse-type = callPackage ../development/python-modules/parse-type { };