Merge pull request #250400 from fabaff/fido2-bump

python311Packages.fido2: 1.1.1 -> 1.1.2

2 files changed, 49 insertions, 19 deletions

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index 459f0799477d9..7cd11eefcbcc2 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -1,37 +1,54 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, poetry-core
-, six
 , cryptography
+, fetchPypi
 , mock
+, poetry-core
 , pyfakefs
+, pythonOlder
+, six
 , unittestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "1.1.1";
+  version = "1.1.2";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XcSVyoxZwcM3ODtLjDFNRrktXG/GUOcZhMbX+VQHn8M=";
+    hash = "sha256-YRDZExBvdhmSAbMtJisoV1YsxGuh0LnFH7zjDck2xXM=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
-  propagatedBuildInputs = [ six cryptography ];
+  propagatedBuildInputs = [
+    cryptography
+    six
+  ];
 
-  nativeCheckInputs = [ unittestCheckHook mock pyfakefs ];
+  nativeCheckInputs = [
+    unittestCheckHook
+    mock
+    pyfakefs
+  ];
 
-  unittestFlagsArray = [ "-v" ];
+  unittestFlagsArray = [
+    "-v"
+  ];
 
-  pythonImportsCheck = [ "fido2" ];
+  pythonImportsCheck = [
+    "fido2"
+  ];
 
   meta = with lib; {
-    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB.";
+    description = "Provides library functionality for FIDO 2.0, including communication with a device over USB";
     homepage = "https://github.com/Yubico/python-fido2";
+    changelog = "https://github.com/Yubico/python-fido2/releases/tag/${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ prusnak ];
   };
diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix
index a037511288f85..2903c0f8d5662 100644
--- a/pkgs/development/python-modules/pylink-square/default.nix
+++ b/pkgs/development/python-modules/pylink-square/default.nix
@@ -1,20 +1,21 @@
 { lib
 , buildPythonPackage
-, fetchPypi
 , fetchFromGitHub
+, fetchPypi
 , mock
 , psutil
-, six
-, future
 , pytestCheckHook
+, pythonOlder
+, six
 }:
 
 buildPythonPackage rec {
   pname = "pylink-square";
   version = "1.2.0";
-
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "square";
     repo = "pylink";
@@ -22,20 +23,32 @@ buildPythonPackage rec {
     hash = "sha256-rcM7gvUUfXN5pL9uIihzmOCXA7NKjiMt2GaQaGJxD9M=";
   };
 
-  propagatedBuildInputs = [ psutil six future ];
+  propagatedBuildInputs = [
+    psutil
+    six
+  ];
 
   nativeCheckInputs = [
     mock
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "pylink" ];
+  pythonImportsCheck = [
+    "pylink"
+  ];
+
+  disabledTests = [
+    # AttributeError: 'called_once_with' is not a valid assertion
+    "test_cp15_register_write_success"
+    "test_jlink_restarted"
+    "test_set_log_file_success"
+  ];
 
   meta = with lib; {
     description = "Python interface for the SEGGER J-Link";
     homepage = "https://github.com/square/pylink";
-    changelog = "https://github.com/square/pylink/blob/${src.rev}/CHANGELOG.md";
-    maintainers = with maintainers; [ dump_stack ];
+    changelog = "https://github.com/square/pylink/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
+    maintainers = with maintainers; [ dump_stack ];
   };
 }