fix(tvix-cache): Update the cache to a working version

This commit is contained in:
sinavir 2024-09-23 00:40:06 +02:00
parent 89d219fe8a
commit 05f7be1983
3 changed files with 563 additions and 784 deletions

View file

@ -12,22 +12,17 @@ let
object_store_options = { }; object_store_options = { };
}; };
directoryservices = { directoryservices = {
sled = { redb = {
type = "sled"; type = "redb";
is_temporary = false; is_temporary = false;
path = "${dataDir}/directory.sled"; path = "${dataDir}/directory.redb";
};
object = {
type = "objectstore";
object_store_url = "file://${dataDir}/directory.objectstore";
object_store_options = { };
}; };
}; };
pathinfoservices = { pathinfoservices = {
infra = { infra = {
type = "sled"; type = "redb";
is_temporary = false; is_temporary = false;
path = "${dataDir}/pathinfo.sled"; path = "${dataDir}/pathinfo.redb";
}; };
infra-signing = { infra-signing = {
type = "keyfile-signing"; type = "keyfile-signing";
@ -41,20 +36,20 @@ let
"127.0.0.1:8056" = { "127.0.0.1:8056" = {
endpoint_type = "Http"; endpoint_type = "Http";
blob_service = "default"; blob_service = "default";
directory_service = "object"; directory_service = "redb";
path_info_service = "infra"; path_info_service = "infra";
}; };
"127.0.0.1:8058" = { "127.0.0.1:8058" = {
endpoint_type = "Http"; endpoint_type = "Http";
blob_service = "default"; blob_service = "default";
directory_service = "object"; directory_service = "redb";
path_info_service = "infra-signing"; path_info_service = "infra-signing";
}; };
# Add grpc for management and because it is nice # Add grpc for management and because it is nice
"127.0.0.1:8057" = { "127.0.0.1:8057" = {
endpoint_type = "Grpc"; endpoint_type = "Grpc";
blob_service = "default"; blob_service = "default";
directory_service = "object"; directory_service = "redb";
path_info_service = "infra"; path_info_service = "infra";
}; };
}; };

File diff suppressed because it is too large Load diff

View file

@ -1,15 +1,16 @@
{ {
lib,
fetchgit, fetchgit,
rustPlatform, rustPlatform,
protobuf, protobuf,
runCommand, runCommand,
}: }:
let let
tvix-hash = "sha256-KNl+Lv0aMqSFVFt6p/GdmNDddzccW4wKfZB7W6Gv5F0="; tvix-hash = "sha256-It3brj6SX+9OIGyKsITnNLjzDnB7CBCZDS+S7arRiWY=";
tvix-src = fetchgit { tvix-src = fetchgit {
name = "tvix"; name = "tvix";
url = "https://git.dgnum.eu/mdebray/tvl-depot"; url = "https://git.dgnum.eu/mdebray/tvl-depot";
rev = "920b7118d5b0917e426367107f7b7b66089a8d7b"; rev = "3389c550b92d8b631f75e5a77e244fe698e4b4b2";
hash = tvix-hash; hash = tvix-hash;
}; };
protos = runCommand "tvix-protos" { } '' protos = runCommand "tvix-protos" { } ''
@ -25,8 +26,8 @@ rustPlatform.buildRustPackage rec {
src = fetchgit { src = fetchgit {
url = "https://git.lix.systems/sinavir/multitenant-tvix-binary-cache.git"; url = "https://git.lix.systems/sinavir/multitenant-tvix-binary-cache.git";
rev = "0d7d4cf66242facecba485b1085e285e8d46c038"; rev = "0d4c5ca8f75e156f9485fc085e93e85260e2e843";
hash = "sha256-IU3OS3ePJeBNiY8HbhoYW5b03Nq8BJ4AWe+bGv4dAuw="; hash = "sha256-OmXud+MhF2M02ofqDOnmazf190vu91i6RZ2y0NdA8oU=";
}; };
PROTO_ROOT = protos; PROTO_ROOT = protos;
@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"bigtable_rs-0.2.10" = "sha256-2NC3rHbS2rdD0Rnovymn1xaR22KaR6yzWr298wOPxlY=";
"nar-bridge-0.1.0" = tvix-hash; "nar-bridge-0.1.0" = tvix-hash;
}; };
}; };