From 5ceca49714e354947ca4c93ffcefc46ad6be9bd8 Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Thu, 28 Jun 2018 15:08:27 +0100
Subject: [PATCH 1/2] yubikey-manager: 0.4.0 -> 0.7.0

---
 pkgs/tools/misc/yubikey-manager/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index c7fbeddd13a4..c8c0ba706c36 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -2,11 +2,11 @@
   yubikey-personalization, libu2f-host, libusb1 }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "yubikey-manager-0.4.0";
+  name = "yubikey-manager-0.7.0";
 
   srcs = fetchurl {
     url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
-    sha256 = "0dc0mqg8r6kjh0s2rmrggfxbx9imslajjrj80rffcvg64a2vgsgb";
+    sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr";
   };
 
   propagatedBuildInputs =
@@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec {
       pyusb
       pyopenssl
       six
+      fido2
     ] ++ [
       libu2f-host
       libusb1

From 97e30243764f8b6acc762a89d26af9bf97bf291a Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Thu, 28 Jun 2018 15:08:48 +0100
Subject: [PATCH 2/2] python-fido2: init at 0.3.0

---
 .../python-modules/fido2/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/fido2/default.nix

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
new file mode 100644
index 000000000000..3642d4e55b90
--- /dev/null
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, six, cryptography }:
+
+buildPythonPackage rec {
+  pname = "fido2";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ddbhg4nsabi9w66l8vkr0i5r80jqihlic5yrdl3v1aqahvxph1j";
+  };
+
+  # The pypi package does not include tests
+  # Check https://github.com/Yubico/python-fido2/pull/8
+  doCheck = false;
+
+  propagatedBuildInputs = [ six cryptography ];
+
+  meta = with lib; {
+    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
+    homepage = https://github.com/Yubico/python-fido2;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80ca395a0265..9a12bd629d8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -266,6 +266,8 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  fido2 = callPackage ../development/python-modules/fido2 {  };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };