From 4e6f525df867f30bda16b6d5e7fb6d254982195c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Mon, 13 Oct 2025 20:31:02 -0700 Subject: [PATCH] python3Packages.tabcmd: fix build setuptools-scm takes the place of pyinstaller-versionfile. --- .../development/python-modules/tabcmd/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 12911b3552fc..5fba05536150 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { version = "2.0.18"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-erGngJ3CW+c3PuVq4BTrPGSZ2L/M0EykSoZocku0lOE="; @@ -39,6 +37,8 @@ buildPythonPackage rec { # Remove an unneeded dependency that can't be resolved # https://github.com/tableau/tabcmd/pull/282 sed -i "/'argparse',/d" pyproject.toml + # Uses setuptools-scm instead + sed -i "/'pyinstaller_versionfile',/d" pyproject.toml ''; pythonRelaxDeps = [ @@ -46,14 +46,19 @@ buildPythonPackage rec { "urllib3" ]; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; + + pythonRemoveDeps = [ + "pyinstaller_versionfile" + ]; dependencies = [ appdirs - argparse doit ftfy - pyinstaller-versionfile requests setuptools-scm tableauserverclient