From ca6ae1f6f45c3d4ced79e17fcef0307c3249e85f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Nov 2023 09:36:35 +0000 Subject: [PATCH 1/4] python311Packages.agate-excel: 0.2.5 -> 0.3.0 --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index a3e962ea6cd2..d4beedd34164 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.5"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; + sha256 = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; }; propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; From dd6037e8f4040d60d2f6c246a7acb36b9868b751 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Nov 2023 08:08:59 +0100 Subject: [PATCH 2/4] python311Packages.agate-excel: add changelog to meta --- pkgs/development/python-modules/agate-excel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index d4beedd34164..1908d2a796a4 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -19,8 +19,9 @@ buildPythonPackage rec { meta = with lib; { description = "Adds read support for excel files to agate"; - homepage = "https://github.com/wireservice/agate-excel"; - license = licenses.mit; + homepage = "https://github.com/wireservice/agate-excel"; + changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; } From a5ad53dad8e0e143ba28573b60d3476a84343d87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Nov 2023 08:10:26 +0100 Subject: [PATCH 3/4] python311Packages.agate-excel: equalize content --- .../python-modules/agate-excel/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 1908d2a796a4..03c539a6b8db 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,5 +1,11 @@ -{ lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, olefile, pytestCheckHook +{ lib +, fetchPypi +, buildPythonPackage +, agate +, openpyxl +, xlrd +, olefile +, pytestCheckHook }: buildPythonPackage rec { @@ -8,14 +14,23 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; + hash = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; }; - propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; + propagatedBuildInputs = [ + agate + openpyxl + xlrd + olefile + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "agate" ]; + pythonImportsCheck = [ + "agate" + ]; meta = with lib; { description = "Adds read support for excel files to agate"; From 53d14cc5f88f14e0dad7aad6bec2f407c388a66d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Nov 2023 08:12:08 +0100 Subject: [PATCH 4/4] python311Packages.agate-excel: add format - disable on unsupported Python releases --- pkgs/development/python-modules/agate-excel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index 03c539a6b8db..80ff09aa25e7 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -6,11 +6,15 @@ , xlrd , olefile , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "agate-excel"; version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version;