This commit is contained in:
Linus Heckemann 2024-11-07 14:43:23 +01:00
parent 1ab0f99e77
commit 5bb8103962
2 changed files with 22 additions and 17 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,21 +1,21 @@
{ {
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 = builtins.fetchGit {
name = "tvix"; name = "tvix";
url = "https://code.tvl.fyi/depot.git"; url = "https://code.tvl.fyi/depot.git";
rev = "96a78877eb0d3109bd5b76345b9f1aa87bb3ec20"; rev = "96a78877eb0d3109bd5b76345b9f1aa87bb3ec20";
}; },
}:
rustPlatform.buildRustPackage {
inherit pname src;
version = "0.1.0";
patches = [ patches = [
(fetchpatch { (fetchpatch {
@ -32,13 +32,18 @@ rustPlatform.buildRustPackage rec {
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 ];