From e82e9bd8a33da6facd6d2368274ee40e393173e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Apr 2026 18:05:39 +0200 Subject: [PATCH] python3Packages.oletools: modernize --- .../python-modules/oletools/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index bc197109e83a..2d10dfe9509a 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -7,11 +7,12 @@ msoffcrypto-tool, olefile, pcodedmp, + setuptools, pyparsing, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "oletools"; version = "0.60.2"; format = "setuptools"; @@ -19,11 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "decalage2"; repo = "oletools"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "pyparsing" ]; + + build-system = [ setuptools ]; + + dependencies = [ colorclass easygui msoffcrypto-tool @@ -34,11 +39,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0" - ''; - disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" @@ -54,10 +54,11 @@ buildPythonPackage rec { meta = { description = "Module to analyze MS OLE2 files and MS Office documents"; homepage = "https://github.com/decalage2/oletools"; + changelog = "https://github.com/decalage2/oletools/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ bsd2 # and mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +})