Compare commits

...

3 commits

Author SHA1 Message Date
Linus Heckemann 5bb8103962 hacks? 2024-11-07 14:43:23 +01:00
Linus Heckemann 1ab0f99e77 Bump tvix 2024-10-06 15:52:08 +02:00
Linus Heckemann e4aa3b2aec avoid IFD, fix patch 2024-10-05 16:29:41 +02:00
2 changed files with 29 additions and 23 deletions

View file

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

View file

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