From 3d6c7b222f9d8a5f54dc49999e6488dd78ef0367 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:41:01 +0200 Subject: [PATCH 1/3] python312Packages.msoffcrypto-tool: 5.3.1 -> 5.4.0 Diff: https://github.com/nolze/msoffcrypto-tool/compare/refs/tags/v5.3.1...v5.4.0 Changelog: https://github.com/nolze/msoffcrypto-tool/blob/v5.4.0/CHANGELOG.md --- pkgs/development/python-modules/msoffcrypto-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index fd297474eb70..aafc6c88f7b0 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; - version = "5.3.1"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nolze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aQtEJyG0JGe4eSIRI4OUjJZNDBni6FFyJXXkbeiotSY="; + hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0="; }; nativeBuildInputs = [ From 292208952eda936b70d877140e525034fc187f2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:41:43 +0200 Subject: [PATCH 2/3] python312Packages.msoffcrypto-tool: refactor --- .../python-modules/msoffcrypto-tool/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index aafc6c88f7b0..0991f5dc8d66 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -12,22 +12,22 @@ buildPythonPackage rec { pname = "msoffcrypto-tool"; version = "5.4.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nolze"; - repo = pname; + repo = "msoffcrypto-tool"; rev = "refs/tags/v${version}"; hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ cryptography olefile setuptools @@ -48,10 +48,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys"; - mainProgram = "msoffcrypto-tool"; homepage = "https://github.com/nolze/msoffcrypto-tool"; changelog = "https://github.com/nolze/msoffcrypto-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "msoffcrypto-tool"; }; } From d6a42937b51cd689402019f80503f4537c004117 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:42:02 +0200 Subject: [PATCH 3/3] python312Packages.msoffcrypto-tool: format with nixfmt --- .../msoffcrypto-tool/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix index 0991f5dc8d66..830a37164a5e 100644 --- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -1,12 +1,13 @@ -{ lib -, olefile -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, cryptography -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + olefile, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + cryptography, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ cryptography @@ -33,18 +32,14 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test fails with AssertionError "test_cli" ]; - pythonImportsCheck = [ - "msoffcrypto" - ]; + pythonImportsCheck = [ "msoffcrypto" ]; meta = with lib; { description = "Python tool and library for decrypting MS Office files with passwords or other keys";