Unverified Commit c3fad51a authored by Sophie Tauchert's avatar Sophie Tauchert
Browse files

nitrokey-app2: 2.1.5 -> 2.2.2, use qt6 wrap hook

parent 1a00458a

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

+11 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, python3

, fetchPypi

, fetchFromGitHub

, wrapQtAppsHook

, qtbase

, qtwayland

}:



let
@@ -19,7 +23,7 @@ let 
  };

in python.pkgs.buildPythonApplication rec {

  pname = "nitrokey-app2";

  version = "2.1.5";

  version = "2.2.2";

  pyproject = true;



  disabled = python.pythonOlder "3.9";
@@ -28,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
@@ -41,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
@@ -40935,7 +40935,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 { };