dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

python3Packages.spsdk: remove meta.broken as spsdk 2.1.1 uses cryptography 42, pynitrokey, nitrokey-app2: unpin cryptgraphy

Browse Source 
currently, using pynitrokey 0.4.46 leads to import errors in nitrokey-app2
This commit is contained in:
Sophie Tauchert 2024-04-14 22:38:35 +02:00
parent cfd6b5fc90
commit 1a00458a66
No known key found for this signature in database
GPG Key ID: 52701DE5F5F51125
3 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/by-name/py/pynitrokey/package.nix
View File

@ -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

1
pkgs/development/python-modules/spsdk/default.nix
View File

@ -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";

16
pkgs/tools/security/nitrokey-app2/default.nix
View File

@ -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
});
};
};