From 607a7c79aa9a16e05aeae3d3a4e3653564480818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Feb 2024 22:00:37 -0800 Subject: [PATCH] pynitrokey: pin cryptography --- pkgs/by-name/py/pynitrokey/package.nix | 28 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/py/pynitrokey/package.nix diff --git a/pkgs/by-name/py/pynitrokey/package.nix b/pkgs/by-name/py/pynitrokey/package.nix new file mode 100644 index 000000000000..beafb787b63b --- /dev/null +++ b/pkgs/by-name/py/pynitrokey/package.nix @@ -0,0 +1,28 @@ +{ python3 +, fetchPypi +, rustPlatform +}: + +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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da5c8d5e0b37..7c2da058acd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41479,8 +41479,6 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - pynitrokey = with python3Packages; toPythonApplication pynitrokey; - nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { };