From a1e8cbb3fc342ea1efedbb1b8d4d720678993b4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 19:37:15 +0000 Subject: [PATCH 1/3] python311Packages.tabula-py: 2.9.0 -> 2.9.1 --- pkgs/development/python-modules/tabula-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index bdc31012cf2d..d8529807ae72 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-MGv2n8DoSjumD3lRcqwI0sEsaEDgs1n+st8DwZuZauo="; + hash = "sha256-C06du4mhpnF2qxcEMZxp5O/8xpNaj9Jp8LFaxBkGF/Q="; }; postPatch = '' From 8209a5ddc0612a830dd31c79e9d959d025e20d59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:55:53 +0200 Subject: [PATCH 2/3] python312Packages.tabula-py: refactor --- pkgs/development/python-modules/tabula-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index d8529807ae72..e4503e6b3326 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -28,10 +28,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace tabula/backend.py \ - --replace '"java"' '"${lib.getExe jre}"' + --replace-fail '"java"' '"${lib.getExe jre}"' ''; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { jre ]; - propagatedBuildInputs = [ + dependencies = [ distro numpy pandas From ece1819ea0f903aa32244f543bbfa336b7079beb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 May 2024 08:56:27 +0200 Subject: [PATCH 3/3] python311Packages.tabula-py: format with nixfmt --- .../python-modules/tabula-py/default.nix | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index e4503e6b3326..4556443136b2 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -1,15 +1,16 @@ -{ lib -, buildPythonPackage -, distro -, fetchFromGitHub -, jre -, numpy -, pandas -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm -, jpype1 +{ + lib, + buildPythonPackage, + distro, + fetchFromGitHub, + jre, + numpy, + pandas, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + jpype1, }: buildPythonPackage rec { @@ -36,9 +37,7 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = [ - jre - ]; + buildInputs = [ jre ]; dependencies = [ distro @@ -47,13 +46,9 @@ buildPythonPackage rec { jpype1 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "tabula" - ]; + pythonImportsCheck = [ "tabula" ]; disabledTests = [ # Tests require network access