Unverified Commit 1a00458a authored by Sophie Tauchert's avatar Sophie Tauchert
Browse files

python3Packages.spsdk: remove meta.broken as spsdk 2.1.1 uses cryptography 42,... 

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
parent cfd6b5fc

pkgs/by-name/py/pynitrokey/package.nix

+2 −27
Original line number Diff line number Diff line 
{ 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

pkgs/development/python-modules/spsdk/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/tools/security/nitrokey-app2/default.nix

+3 −13
Original line number Diff line number Diff line 
{ 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

      });

    };

  };