From ec632ec3b6c2eb0bca14ea3e87c71479cc55bc50 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 27 May 2018 12:51:54 -0400
Subject: [PATCH 1/2] pythonPackages.keyrings-alt: 2.3 -> 3.1

---
 pkgs/development/python-modules/keyrings-alt/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 140d4297cda5..643cb89920ce 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,15 +1,17 @@
 { stdenv, buildPythonPackage, fetchPypi, six
-, pytest, unittest2, mock, keyring
+, pytest, unittest2, mock, keyring, setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "keyrings.alt";
-  version = "2.3";
+  version = "3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d";
+    sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m";
   };
+
+  nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ six ];
 
   # Fails with "ImportError: cannot import name mock"

From 1e815b50c98355a1b5d7b9b00b3319dd00b51131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 27 May 2018 19:30:53 +0200
Subject: [PATCH 2/2] pythonPackages.keyrings-alt: run tests

---
 .../python-modules/keyrings-alt/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 643cb89920ce..9f3fc8dc4d36 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, six
-, pytest, unittest2, mock, keyring, setuptools_scm
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six
+, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm
 }:
 
 buildPythonPackage rec {
@@ -15,8 +15,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
 
   # Fails with "ImportError: cannot import name mock"
-  doCheck = false;
-  checkInputs = [ pytest unittest2 mock keyring ];
+  #doCheck = false;
+  checkInputs = [ pytest pytest-flake8 keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     license = licenses.mit;