diff --git a/pkgs/smi/default.nix b/pkgs/smi/default.nix index d2ac140..b88382d 100644 --- a/pkgs/smi/default.nix +++ b/pkgs/smi/default.nix @@ -39,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools requests + textual black distro elasticsearch @@ -50,14 +51,7 @@ buildPythonPackage rec { importlib-resources pkgs.pre-commit tools-common - tools-common.textual ]; dontUsePytestCheck = true; # no tests - - installCheckPhase = '' - output=$($out/bin/tt-smi || true) - echo "tt-smi output: $output" - echo $output | grep -q "No Tenstorrent driver detected" - ''; } diff --git a/pkgs/tools-common/default.nix b/pkgs/tools-common/default.nix index a5706e9..dac5b00 100644 --- a/pkgs/tools-common/default.nix +++ b/pkgs/tools-common/default.nix @@ -1,28 +1,13 @@ -{ fetchFromGitHub, python3Packages }: +{ pkgs }: -let - # Can be unpinned once https://github.com/tenstorrent/tt-tools-common/blob/main/pyproject.toml#L32 - # is v1 - textual_0_82 = python3Packages.textual.overridePythonAttrs (old: rec { - version = "0.82.0"; - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - rev = "refs/tags/v${version}"; - hash = "sha256-belpoXQ+CkTchK+FjI/Ur8v4cNgzX39xLdNfPCwaU6E="; - }; - disabledTests = old.disabledTests ++ [ - "test_selection" - ]; - }); -in +with pkgs.python3Packages; -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "tools-common"; # https://github.com/tenstorrent/tt-smi/blob/main/pyproject.toml#L31 version = "1.4.11"; - src = fetchFromGitHub { + src = pkgs.fetchFromGitHub { owner = "tenstorrent"; repo = "tt-tools-common"; rev = "refs/tags/v${version}"; @@ -31,7 +16,7 @@ python3Packages.buildPythonPackage rec { format = "pyproject"; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "distro" @@ -44,14 +29,14 @@ python3Packages.buildPythonPackage rec { "tqdm" ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ setuptools distro elasticsearch psutil pyyaml rich - textual_0_82 + textual requests jsons tqdm @@ -61,8 +46,4 @@ python3Packages.buildPythonPackage rec { pythonImportsCheck = [ "tt_tools_common" ]; - - passthru = { - textual = textual_0_82; - }; }