From 1a00458a66b604c39dd391b3145d59965e8521db Mon Sep 17 00:00:00 2001
From: Sophie Tauchert <sophie@999eagle.moe>
Date: Sun, 14 Apr 2024 22:38:35 +0200
Subject: [PATCH] python3Packages.spsdk: remove meta.broken as spsdk 2.1.1 uses
 cryptography 42, pynitrokey, nitrokey-app2: unpin cryptgraphy

currently, using pynitrokey 0.4.46 leads to import errors in nitrokey-app2
---
 pkgs/by-name/py/pynitrokey/package.nix        | 29 ++-----------------
 .../python-modules/spsdk/default.nix          |  1 -
 pkgs/tools/security/nitrokey-app2/default.nix | 16 ++--------
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/py/pynitrokey/package.nix b/pkgs/by-name/py/pynitrokey/package.nix
index beafb787b63b..aadc6d4a56e8 100644
--- a/pkgs/by-name/py/pynitrokey/package.nix
+++ b/pkgs/by-name/py/pynitrokey/package.nix
@@ -1,28 +1,3 @@
-{ python3
-, fetchPypi
-, rustPlatform
-}:
+{ python3 }:
 
-let
-  python = python3.override {
-    packageOverrides = self: super: {
-      # https://github.com/nxp-mcuxpresso/spsdk/issues/64
-      cryptography = super.cryptography.overridePythonAttrs (old: rec {
-        version = "41.0.7";
-        src = fetchPypi {
-          inherit (old) pname;
-          inherit version;
-          hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw=";
-        };
-        cargoDeps = rustPlatform.fetchCargoTarball {
-          inherit src;
-          sourceRoot = "${old.pname}-${version}/${old.cargoRoot}";
-          name = "${old.pname}-${version}";
-          hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw=";
-        };
-        patches = [ ];
-        doCheck = false; # would require overriding cryptography-vectors
-      });
-    };
-  };
-in with python.pkgs; toPythonApplication pynitrokey
+with python3.pkgs; toPythonApplication pynitrokey
diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix
index b64ef4a3d910..35b10ef7c97c 100644
--- a/pkgs/development/python-modules/spsdk/default.nix
+++ b/pkgs/development/python-modules/spsdk/default.nix
@@ -107,7 +107,6 @@ buildPythonPackage rec {
   passthru.tests.version = testers.testVersion { package = spsdk; };
 
   meta = with lib; {
-    broken = versionAtLeast cryptography.version "41.1";
     changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst";
     description = "NXP Secure Provisioning SDK";
     homepage = "https://github.com/nxp-mcuxpresso/spsdk";
diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix
index 6f392f5d7f53..563a76732dbe 100644
--- a/pkgs/tools/security/nitrokey-app2/default.nix
+++ b/pkgs/tools/security/nitrokey-app2/default.nix
@@ -1,29 +1,19 @@
 { lib
 , python3
 , fetchPypi
-, rustPlatform
 , fetchFromGitHub
 }:
 
 let
   python = python3.override {
     packageOverrides = self: super: {
-      # https://github.com/nxp-mcuxpresso/spsdk/issues/64
-      cryptography = super.cryptography.overridePythonAttrs (old: rec {
-        version = "41.0.7";
+      pynitrokey = super.pynitrokey.overridePythonAttrs (old: rec {
+        version = "0.4.45";
         src = fetchPypi {
           inherit (old) pname;
           inherit version;
-          hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw=";
+          hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8=";
         };
-        cargoDeps = rustPlatform.fetchCargoTarball {
-          inherit src;
-          sourceRoot = "${old.pname}-${version}/${old.cargoRoot}";
-          name = "${old.pname}-${version}";
-          hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw=";
-        };
-        patches = [ ];
-        doCheck = false; # would require overriding cryptography-vectors
       });
     };
   };