From 29dc8c01e271c42cc8205c059976475de548988c Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 20 Nov 2024 05:04:05 +0200 Subject: [PATCH] Update sfpi and add sfpi-no-lfs to prepare to update to a newer commit --- pkgs/sfpi/default.nix | 35 ++++++++++++++++++++++++++++++++--- pkgs/sfpi/tt-gcc.nix | 4 ++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/sfpi/default.nix b/pkgs/sfpi/default.nix index fb6f1a5..0739c1d 100644 --- a/pkgs/sfpi/default.nix +++ b/pkgs/sfpi/default.nix @@ -3,13 +3,12 @@ rec { sfpi = pkgs.stdenv.mkDerivation { pname = "sfpi"; - version = "unstable-2024-09-25"; + version = "unstable-2024-10-10"; src = pkgs.fetchFromGitHub { owner = "tenstorrent-metal"; repo = "sfpi"; - # One commit before they started to use gcc 12 - rev = "08d39202f283ab9122e162bcead5b7c90014fa86"; + rev = "899b8b6c90fc3e18ad081fd556eaa1a473c8a357"; hash = "sha256-EZHUhAqn9/r02IC+TVoxfIyzEctYQKd5azcrXE5DIgg="; }; @@ -25,6 +24,36 @@ rec { mkdir -p $out/compiler/libexec bin/release.sh $out ''; + + passthru = { inherit sfpi-no-lfs; }; + }; + + + sfpi-no-lfs = pkgs.stdenv.mkDerivation { + pname = "sfpi"; + version = "unstable-2024-11-15"; + + src = pkgs.fetchFromGitHub { + owner = "tenstorrent-metal"; + repo = "sfpi"; + rev = "fcb552bc66d274fc4ffadc35eb4e6d1f20b2e6b3"; + hash = ""; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs --build $scripts/build.sh + ''; + + buildPhase = '' + ./scripts/build.sh + ''; + + installPhase = '' + mkdir -p "$out" + cp -r ./sfpi/* "$out" + ''; + }; tt-gcc = import ./tt-gcc.nix { inherit pkgs; }; diff --git a/pkgs/sfpi/tt-gcc.nix b/pkgs/sfpi/tt-gcc.nix index f0dd667..3a91c61 100644 --- a/pkgs/sfpi/tt-gcc.nix +++ b/pkgs/sfpi/tt-gcc.nix @@ -8,10 +8,10 @@ pkgs.stdenv.mkDerivation rec { owner = "tenstorrent-metal"; repo = "sfpi-tt-gcc"; # https://github.com/tenstorrent/sfpi-tt-gcc/commits/tt-rel/gcc-12.2 - rev = "fad3c23c8972adb739ef62d2f35d770062a7cd73"; + rev = "a5c31334942e9df66427837f7268269311fdfc2e"; # this takes a while and we don't need all of them fetchSubmodules = true; - hash = "sha256-X2uVyk4uo0TuDu/2nUXk2v8A4RURvhg0MAoCssAuljI="; + hash = "sha256-1d77+6Yv3i4M7J+vUwcUuFg56wCG9oVeDt+fvBKtHPI="; }; nativeBuildInputs = with pkgs; [