From 64e42b9d68a23a777259b8a7b29744a36b7e811a Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 1 Oct 2024 22:04:18 +0300 Subject: [PATCH] flash: fix build & update & use `pythonRelaxDepsHook` --- flake.nix | 1 + pkgs/flash/default.nix | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 7406204..9fe1350 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,7 @@ flash = import ./pkgs/flash { inherit pkgs; pyluwen = luwen.pyluwen_0_1; + tools-common = common; }; smi = import ./pkgs/smi { inherit pkgs; diff --git a/pkgs/flash/default.nix b/pkgs/flash/default.nix index 7212795..35d289c 100644 --- a/pkgs/flash/default.nix +++ b/pkgs/flash/default.nix @@ -1,18 +1,28 @@ -{ pkgs, pyluwen }: +{ + pkgs, + pyluwen, + tools-common, +}: with pkgs.python3Packages; buildPythonPackage rec { pname = "tt-flash"; - version = "main-01-31-24"; + version = "unstable-2024-09-27"; src = pkgs.fetchFromGitHub { owner = "tenstorrent"; repo = "tt-flash"; - rev = "09db4103efe0c63adc3ea6e61f19eac7eb06d46f"; - hash = "sha256-fNAP/XuPdn51TtBEelSjh93NgMiyP1j6RqjnrzX9dc4="; + rev = "4002fee1da7edfcbf09093ba23612caeca071f23"; + hash = "sha256-O6b/vS/zCjp/mrNzFEylWs0jtwdHY65nwkvn5GFridI="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ + "pyyaml" + ]; + format = "pyproject"; # patches = [ ./pyproject.patch ./log.patch ]; @@ -22,5 +32,6 @@ buildPythonPackage rec { pyyaml pyluwen tabulate + tools-common ]; # requests textual black distro elasticsearch jsons pydantic psutil pyyaml pyluwen importlib-resources pkgs.pre-commit tools-common ]; }