From 92a0f7312d87b20dd7c21ab47e29ae59775355d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 11:34:16 +0200 Subject: [PATCH 1/2] python312Packages.xknxproject: refactor --- pkgs/development/python-modules/xknxproject/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index e548da6e5d16..7296e403541b 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -7,7 +7,6 @@ , pyzipper , setuptools , striprtf -, wheel }: buildPythonPackage rec { @@ -24,12 +23,11 @@ buildPythonPackage rec { hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ cryptography pyzipper striprtf @@ -44,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "ETS project parser"; + description = "Library to extract KNX projects and parses the underlying XML"; homepage = "https://github.com/XKNX/xknxproject"; changelog = "https://github.com/XKNX/xknxproject/releases/tag/${version}"; license = licenses.gpl2Only; From b1b67f4c98d81bd7f9f92bfbc1a5a4e17a1a4090 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Apr 2024 11:34:35 +0200 Subject: [PATCH 2/2] python312Packages.xknxproject: format with nixfmt --- .../python-modules/xknxproject/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 7296e403541b..bd7e126de6a1 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, pyzipper -, setuptools -, striprtf +{ + lib, + buildPythonPackage, + cryptography, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pyzipper, + setuptools, + striprtf, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-/Zg4MYOvbsbJ0zyKuq+gX0PNbm8TyyBMziIaGCq6Lt8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ cryptography @@ -33,13 +32,9 @@ buildPythonPackage rec { striprtf ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "xknxproject" - ]; + pythonImportsCheck = [ "xknxproject" ]; meta = with lib; { description = "Library to extract KNX projects and parses the underlying XML";