modules/default.nix

@@ -110,9 +110,9 @@ in
                   cacheAttrs.config.common-composition
                   {
                     pathinfoservices.default = {
-                      type = "redb";
+                      type = "sled";
                       is_temporary = false;
-                      path = "/var/lib/tvix-daemon-${name}/pathinfos.redb";
+                      path = "/var/lib/tvix-daemon-${name}/pathinfos.sled";
                     };
                   }
                 ];

pkgs/tvix/default.nix

@@ -1,52 +1,46 @@
 {
-  lib,
   fetchgit,
   fetchpatch,
   rustPlatform,
   protobuf,
   packages ? [ ],
   pname ? "tvix",
-  src ? builtins.fetchGit {
-    name = "tvix";
-    url = "https://code.tvl.fyi/depot.git";
-    rev = "96a78877eb0d3109bd5b76345b9f1aa87bb3ec20";
-  },
 }:
 
-rustPlatform.buildRustPackage {
-  inherit pname src;
+rustPlatform.buildRustPackage rec {
+  inherit pname;
   version = "0.1.0";
 
+  src = fetchgit {
+    name = "tvix";
+    url = "https://code.tvl.fyi/depot.git";
+    rev = "e97202e54a02d0717f0457fec0863e3e74fc93d8";
+    hash = "sha256-V/3vSjLp28hv1vJowvy9NlBp7gV6GayHzj4iUN6dek0=";
+  };
+
   patches = [
     (fetchpatch {
-      url = "https://cl.tvl.fyi/changes/depot~12016/revisions/1/patch?download";
+      url = "https://cl.tvl.fyi/changes/depot~12015/revisions/1/patch?download";
       decode = "base64 -d";
-      hash = "sha256-ldIZkkbtYYAPHK62eYnYVudrZCdBqTIg3V27IutFPAA=";
+      hash = "sha256-2KHXwLp5unhC8albVT6Cimw2zZCes93lDdM5jckvxd0=";
     })
   ];
   postPatch = "cd tvix";
 
-  preBuild = ''
-    export PROTO_ROOT=$(realpath $PWD/..)
-  '';
-
   doCheck = false;
 
-  #buildNoDefaultFeatures = true;
-
-  buildFeatures = [
+  cargoBuildFlags = builtins.concatStringsSep " " (
+    builtins.map (v: "-p ${v}") packages
+    ++ [
+      "--features"
       "tvix-store/xp-store-composition"
-    #"tvix-store/fs"
-    #"tvix-store/fuse"
-    #"tvix-store/tonic-reflection"
-    #"nix-compat/async"
-    #"nix-compat/wire"
-  ];
-
-  cargoBuildFlags = builtins.map (v: "-p ${v}") packages;
+    ]
+  );
 
   nativeBuildInputs = [ protobuf ];
 
+  PROTO_ROOT = "/build/${src.name}";
+
   cargoLock = {
     lockFile = src + "/tvix/Cargo.lock";
     allowBuiltinFetchGit = true;