Unverified Commit ac1861c8 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #304110 from 999eagle/update/nitrokey-app2 

pynitrokey: unpin cryptography, nitrokey-app2: 2.1.5 -> 2.2.2, fix qt somewhat
parents 51d92d05 c3fad51a

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

+14 −15
Original line number Diff line number Diff line 
{ lib

, stdenv

, python3

, fetchPypi

, rustPlatform

, fetchFromGitHub

, wrapQtAppsHook

, qtbase

, qtwayland

}:



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

      });

    };

  };

in python.pkgs.buildPythonApplication rec {

  pname = "nitrokey-app2";

  version = "2.1.5";

  version = "2.2.2";

  pyproject = true;



  disabled = python.pythonOlder "3.9";
@@ -38,7 +32,7 @@ in python.pkgs.buildPythonApplication rec { 
    owner = "Nitrokey";

    repo = "nitrokey-app2";

    rev = "v${version}";

    hash = "sha256-mR13zUgCdNS09EnpGLrnOnoIn3p6ZM/0fHKg0OUMWj4=";

    hash = "sha256-MiyfmsrKZRoe7YMEjR1LHPesfJh6+dcSydoEAgrALJ8=";

  };



  # https://github.com/Nitrokey/nitrokey-app2/issues/152
@@ -51,6 +45,11 @@ in python.pkgs.buildPythonApplication rec { 


  nativeBuildInputs = with python.pkgs; [

    poetry-core

    wrapQtAppsHook

  ];



  buildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [

    qtwayland

  ];



  propagatedBuildInputs = with python.pkgs; [

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -40644,7 +40644,7 @@ with pkgs; 














  nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };



























  nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { };













  nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { };





























  fpm2 = callPackage ../tools/security/fpm2 { };