{luwen,pyluwen,flash,smi}: Update and drop pyluwen_0_1

flake.nix

@@ -31,15 +31,12 @@
           {
             kmd = callPackages ./pkgs/kmd { inherit kernel; };
             sfpi = callPackages ./pkgs/sfpi { };
-            luwen = callPackage ./pkgs/luwen { };
+            luwen = (callPackage ./pkgs/luwen { }).luwen;
+            pyluwen = (callPackage ./pkgs/luwen { }).pyluwen;
             tools-common = callPackage ./pkgs/tools-common { };
             system-tools = callPackage ./pkgs/system-tools { };
-            flash = callPackage ./pkgs/flash {
-              pyluwen = self.luwen.pyluwen_0_1;
-            };
-            smi = callPackage ./pkgs/smi {
-              pyluwen = self.luwen.pyluwen;
-            };
+            flash = callPackage ./pkgs/flash { };
+            smi = callPackage ./pkgs/smi { };
             umd = callPackage ./pkgs/umd { };
             metal = callPackage ./pkgs/metal { };
 
@@ -55,8 +52,8 @@
           sfpi-prebuilt = scope.sfpi.prebuilt;
           tt-gcc = scope.sfpi.tt-gcc;
           smi = scope.smi;
-          luwen = scope.luwen.luwen;
-          pyluwen = scope.luwen.pyluwen;
+          luwen = scope.luwen;
+          pyluwen = scope.pyluwen;
           tools-common = scope.tools-common;
           system-tools = scope.system-tools;
           flash = scope.flash;

pkgs/flash/default.nix

@@ -8,13 +8,13 @@ with pkgs.python3Packages;
 
 buildPythonPackage rec {
   pname = "tt-flash";
-  version = "unstable-2024-09-27";
+  version = "3.1.1";
 
   src = pkgs.fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-flash";
-    rev = "4002fee1da7edfcbf09093ba23612caeca071f23";
-    hash = "sha256-O6b/vS/zCjp/mrNzFEylWs0jtwdHY65nwkvn5GFridI=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-t2B1XEOKBKxE2eQiS7pc+EemBWomMgocyk4oRDt0Q78=";
   };
 
   nativeBuildInputs = [ pythonRelaxDepsHook ];

pkgs/luwen/default.nix

@@ -1,17 +1,25 @@
 { pkgs }:
 
-{
-  luwen = pkgs.rustPlatform.buildRustPackage rec {
-    pname = "luwen";
-    version = "unstable-2024-09-13";
+let
+
+  # Upstream does not vendor a lock file so one has to created manually
+  # `cargo generate-lockfile`
+  version = "0.4.9";
 
   src = pkgs.fetchFromGitHub {
     owner = "tenstorrent";
     repo = "luwen";
-      rev = "e4e10e95928f4b73d31ac4f41ea08cd6e3ef5573";
-      sha256 = "sha256-cScaqWAyjDuvy9M2EccMfUHfDq23IWniaKeq+upHzOg=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-K68PjccE2fBkU4RvKv8X6jKRPYqsVhKB6jU92aajLgo=";
   };
 
+in
+
+{
+  luwen = pkgs.rustPlatform.buildRustPackage rec {
+    pname = "luwen";
+    inherit version src;
+
     postPatch = ''
       ln -s ${./Cargo_0_2.lock} Cargo.lock
     '';
@@ -22,14 +30,7 @@
 
   pyluwen = pkgs.python3.pkgs.buildPythonPackage rec {
     pname = "pyluwen";
-    version = "unstable-2024-09-13";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "tenstorrent";
-      repo = "luwen";
-      rev = "e4e10e95928f4b73d31ac4f41ea08cd6e3ef5573";
-      sha256 = "sha256-cScaqWAyjDuvy9M2EccMfUHfDq23IWniaKeq+upHzOg=";
-    };
+    inherit version src;
 
     postPatch = ''
       ln -s ${./Cargo_0_2.lock} Cargo.lock
@@ -52,39 +53,4 @@
       "pyluwen"
     ];
   };
-
-  pyluwen_0_1 = pkgs.python3.pkgs.buildPythonPackage rec {
-    pname = "pyluwen";
-    version = "v0.1.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "tenstorrent";
-      repo = "luwen";
-      rev = "${version}";
-      sha256 = "sha256-MyOzm3dfEkL7MsVzV51DaO+Op3+QhUzsYCTDsvYsvpk=";
-    };
-
-    postPatch = ''
-      ln -s ${./Cargo_0_1.lock} Cargo.lock
-    '';
-
-    buildAndTestSubdir = "crates/pyluwen";
-
-    format = "pyproject";
-
-    cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
-      inherit src postPatch;
-      name = "${pname}-${version}";
-      hash = "sha256-ZXcj/pzQ/tAROdmi2w+AWYBvLSEZFayizxw+BmNDj70=";
-    };
-
-    nativeBuildInputs = [
-      pkgs.rustPlatform.cargoSetupHook
-      pkgs.rustPlatform.maturinBuildHook
-    ];
-
-    pythonImportsCheck = [
-      "pyluwen"
-    ];
-  };
 }