From ebab970fd87504253492c915a5a058d60f0158c3 Mon Sep 17 00:00:00 2001
From: sinavir <sinavir@sinavir.fr>
Date: Sun, 21 Jul 2024 12:43:36 +0200
Subject: [PATCH] feat(tvix): Bump

---
 pkgs/tvix-src.nix     |  6 +++---
 pkgs/tvix/Cargo.lock  | 22 +++++++++++++++++++++-
 pkgs/tvix/default.nix |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/tvix-src.nix b/pkgs/tvix-src.nix
index 75d2eda..1b30774 100644
--- a/pkgs/tvix-src.nix
+++ b/pkgs/tvix-src.nix
@@ -1,7 +1,7 @@
 { fetchgit }:
 fetchgit {
   name = "tvix";
-  url = "https://cl.tvl.fyi/depot";
-  rev = "fdc0cf0c94827fc4940c9f8ac4d310d57aec9f35";
-  hash = "sha256-KGRtHG0zBk+UJQFTztr/ZatS86VccjFlOK0BCcXWWeY=";
+  url = "https://git.dgnum.eu/mdebray/tvl-depot.git";
+  rev = "2f767d0ddaa513da11f491b3b6dead22f795776b";
+  hash = "sha256-UYqyCc9uIckXMIp7iOzwy0COloM3o1FEwzo8ZALOw88=";
 }
diff --git a/pkgs/tvix/Cargo.lock b/pkgs/tvix/Cargo.lock
index 08b0666..4b73146 100644
--- a/pkgs/tvix/Cargo.lock
+++ b/pkgs/tvix/Cargo.lock
@@ -2262,6 +2262,8 @@ dependencies = [
  "tokio-util",
  "tonic",
  "tonic-build",
+ "tower",
+ "tower-http 0.5.2",
  "tracing",
  "tracing-subscriber",
  "tvix-castore",
@@ -4350,6 +4352,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
+dependencies = [
+ "bitflags 2.4.2",
+ "bytes",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.2"
@@ -4755,7 +4774,7 @@ dependencies = [
  "tonic-build",
  "tonic-reflection",
  "tower",
- "tower-http",
+ "tower-http 0.4.4",
  "tracing",
  "tracing-indicatif",
  "tvix-castore",
@@ -4768,6 +4787,7 @@ dependencies = [
 name = "tvix-tracing"
 version = "0.1.0"
 dependencies = [
+ "axum 0.7.5",
  "http 0.2.11",
  "indicatif",
  "lazy_static",
diff --git a/pkgs/tvix/default.nix b/pkgs/tvix/default.nix
index 31ece02..b57d59d 100644
--- a/pkgs/tvix/default.nix
+++ b/pkgs/tvix/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   src = tvix-src;
 
-  patches = [ ./01-remote-path-info-nar-bridge.patch ];
+  patches = [ ];
   postPatch = "cd tvix";
 
   doCheck = false;