From bbc0128e7d4a43b8b01977e5f02d36ee6b84e324 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 29 Mar 2019 09:58:12 -0500
Subject: [PATCH 1/4] libcbor: init at 2019-02-23

---
 .../development/libraries/libcbor/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libcbor/default.nix

diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
new file mode 100644
index 00000000000..fe2f0eadeeb
--- /dev/null
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, cmocka }:
+
+stdenv.mkDerivation rec {
+  pname = "libcbor";
+  version = "2019-02-23";
+
+  src = fetchFromGitHub {
+    owner = "PJK";
+    repo = pname;
+    rev = "87f977e732ca216682a8583a0e43803eb6b9c028";
+    sha256 = "17p1ahdcpf5d4r472lhciscaqjq4pyxy9xjhqqx8mv646xmyripm";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  checkInputs = [ cmocka ];
+
+  doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error
+
+  NIX_CFLAGS_COMPILE = [ "-fno-lto" ];
+
+  meta = with stdenv.lib; {
+    description = "CBOR protocol implementation for C and others";
+    homepage = https://github.com/PJK/libcbor;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 396cd0386b9..5d4caf5b9f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11077,6 +11077,8 @@ in
     then pkgs.libcanberra
     else pkgs.libcanberra-gtk2;
 
+  libcbor = callPackage ../development/libraries/libcbor { };
+
   libcec = callPackage ../development/libraries/libcec { };
   libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
 

From 7cbd6d3cb8673669302dcbcb8f5db6ff3689761f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 29 Mar 2019 10:13:20 -0500
Subject: [PATCH 2/4] libfido2: init at 1.0.0

---
 .../libraries/libfido2/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/libfido2/default.nix

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
new file mode 100644
index 00000000000..d287304e628
--- /dev/null
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, libudev }:
+
+stdenv.mkDerivation rec {
+  pname = "libfido2";
+  version = "1.0.0";
+  src = fetchurl {
+    url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
+    sha256 = "1l0f67fpza0lhq08brpgi4xyfw60w1q790a83x8vqm889l4mph8w";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libcbor libressl libudev ];
+
+  cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ];
+
+  meta = with stdenv.lib; {
+    description = ''
+    Provides library functionality for FIDO 2.0, including communication with a device over USB.
+    '';
+    homepage = https://github.com/Yubico/libfido2;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d4caf5b9f7..c3dfdea9e00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11243,6 +11243,8 @@ in
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
+  libfido2 = callPackage ../development/libraries/libfido2 { };
+
   libfilezilla = callPackage ../development/libraries/libfilezilla { };
 
   libfm = callPackage ../development/libraries/libfm { };

From f74f518b80fe90fd9748fe648cf13fd414971c07 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 29 Mar 2019 11:16:50 -0500
Subject: [PATCH 3/4] libfido2: use udev instead of alias libudev

---
 pkgs/development/libraries/libfido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index d287304e628..d153e475bbe 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, libudev }:
+{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }:
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libcbor libressl libudev ];
+  buildInputs = [ libcbor libressl udev ];
 
   cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ];
 

From b6e91ba23ea62a78b9beaec5fc6ac9f80d151615 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 9 May 2019 07:42:46 -0500
Subject: [PATCH 4/4] libfido2: 1.0.0 -> 1.1.0

https://github.com/Yubico/libfido2/blob/1.1.0/NEWS
---
 pkgs/development/libraries/libfido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index d153e475bbe..b670172ce1e 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchurl {
     url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
-    sha256 = "1l0f67fpza0lhq08brpgi4xyfw60w1q790a83x8vqm889l4mph8w";
+    sha256 = "1h51q9pgv54czf7k6v90b02gnvqw4dlxmz6vi0n06shpkdzv5jh1";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];