mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 07:32:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #312723 from panicgh/nitrokey-app2

Browse Source
This commit is contained in:
Sandro 2024-05-23 13:56:43 +02:00 committed by GitHub
commit 64ea1c0661
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,49 +1,27 @@
{ lib { lib
, stdenv , stdenv
, python3 , python3
, fetchPypi
, fetchFromGitHub , fetchFromGitHub
, wrapQtAppsHook , wrapQtAppsHook
, qtbase , qtbase
, qtwayland , qtwayland
}: }:
let python3.pkgs.buildPythonApplication rec {
python = python3.override {
packageOverrides = self: super: {
pynitrokey = super.pynitrokey.overridePythonAttrs (old: rec {
version = "0.4.45";
src = fetchPypi {
inherit (old) pname;
inherit version;
hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8=";
};
});
};
};
in python.pkgs.buildPythonApplication rec {
pname = "nitrokey-app2"; pname = "nitrokey-app2";
version = "2.2.2"; version = "2.3.0";
pyproject = true; pyproject = true;
disabled = python.pythonOlder "3.9"; disabled = python3.pythonOlder "3.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Nitrokey"; owner = "Nitrokey";
repo = "nitrokey-app2"; repo = "nitrokey-app2";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MiyfmsrKZRoe7YMEjR1LHPesfJh6+dcSydoEAgrALJ8="; hash = "sha256-BSq3ezNt6btQUO1hMVw9bN3VCyUOUhfRFJcHDGkIm6Q=";
}; };
# https://github.com/Nitrokey/nitrokey-app2/issues/152 nativeBuildInputs = with python3.pkgs; [
#
# pythonRelaxDepsHook does not work here, because it runs in postBuild and
# only modifies the dependencies in the built distribution.
postPatch = ''
substituteInPlace pyproject.toml --replace 'pynitrokey = "' 'pynitrokey = ">='
'';
nativeBuildInputs = with python.pkgs; [
poetry-core poetry-core
wrapQtAppsHook wrapQtAppsHook
]; ];
@ -52,7 +30,7 @@ in python.pkgs.buildPythonApplication rec {
qtwayland qtwayland
]; ];
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
pynitrokey pynitrokey
pyudev pyudev
pyside6 pyside6