From ccf57ee1ec618e8ff15b53d15acce59167dcded9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:33:20 +0200 Subject: [PATCH 1/3] python312Packages.lnkparse3: 1.4.0 -> 1.5.0 Diff: https://github.com/Matmaus/LnkParse3/compare/refs/tags/v1.4.0...v1.5.0 Changelog: https://github.com/Matmaus/LnkParse3/blob/1.5.0/CHANGELOG.md --- pkgs/development/python-modules/lnkparse3/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index 94fd7aaee190..ffeb5c7cb86c 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pyyaml , setuptools }: buildPythonPackage rec { pname = "lnkparse3"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,13 +18,17 @@ buildPythonPackage rec { owner = "Matmaus"; repo = "LnkParse3"; rev = "refs/tags/v${version}"; - hash = "sha256-aWMkLFbmikdj4mlAPpo0qrxfE8zgRcSV83aiws03XsQ="; + hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + pyyaml + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 9f9610c3140b4a0321451f9fe6bf3989137f537f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:34:15 +0200 Subject: [PATCH 2/3] python312Packages.lnkparse3: format with nixfmt --- .../python-modules/lnkparse3/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index ffeb5c7cb86c..c6fd742f27be 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, pyyaml -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pyyaml, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - pyyaml - ]; + propagatedBuildInputs = [ pyyaml ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "LnkParse3" - ]; + pythonImportsCheck = [ "LnkParse3" ]; meta = with lib; { description = "Windows Shortcut file (LNK) parser"; From 6aea91e153aae4c2e9bb59068a9c20caef56bab1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:35:32 +0200 Subject: [PATCH 3/3] python312Packages.lnkparse3: refactor --- pkgs/development/python-modules/lnkparse3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index c6fd742f27be..70d541fe52d8 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -22,9 +22,9 @@ buildPythonPackage rec { hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ pyyaml ]; + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook ];