From e3bce2e84f1a7525939b7e0b65d3052687c4c252 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 1 Oct 2024 22:01:05 +0300 Subject: [PATCH] tools-common: fix build & update & use `pythonRelaxDepsHook` --- pkgs/common/default.nix | 15 ++++++++++----- pkgs/common/pyproject.patch | 13 ------------- 2 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 pkgs/common/pyproject.patch diff --git a/pkgs/common/default.nix b/pkgs/common/default.nix index 56c7b6d..e39d97a 100644 --- a/pkgs/common/default.nix +++ b/pkgs/common/default.nix @@ -4,19 +4,21 @@ with pkgs.python3Packages; buildPythonPackage rec { pname = "tools-common"; - version = "main-2024-01-31"; + version = "unstable-2024-09-27"; src = pkgs.fetchFromGitHub { owner = "tenstorrent"; repo = "tt-tools-common"; - rev = "b23ce52352fdf19bf8cd3e3fcea181aa9d2e7dc9"; - sha256 = "sha256-+BMYCI0+G4zYTI7uyPp+RLyUkKt1fS1WNltnD3xMk2g="; + rev = "a89b2db6d086698ab0351a820ea689b4809429a3"; + sha256 = "sha256-xeiJQkWsg9p8re2XJai0mNWuP7LwJ9faj3+Z3U/KvzI="; }; - patches = [ ./pyproject.patch ]; - format = "pyproject"; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "distro" "elasticsearch" "psutil" "pyyaml" "rich" "requests" "textual" "tqdm" ]; + propagatedBuildInputs = [ setuptools distro @@ -26,6 +28,9 @@ buildPythonPackage rec { rich textual requests + jsons + tqdm + pydantic ]; pythonImportsCheck = [ diff --git a/pkgs/common/pyproject.patch b/pkgs/common/pyproject.patch deleted file mode 100644 index 78981ec..0000000 --- a/pkgs/common/pyproject.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 8be9d63..0dd0736 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -29,7 +29,7 @@ dependencies = [ - 'psutil==5.9.6', - 'pyyaml==6.0.1', - 'rich==13.7.0', -- 'textual==0.42.0', -+ 'textual>=0.42.0', - 'requests==2.31.0', - ] -