lheckemann/binary-cache
0
0
Fork 0
forked from yu-re-ka/binary-cache
Code Pull requests Activity

Compare commits

base: lheckemann:master
Branches Tags
lheckemann:master
yu-re-ka:master
..
compare: yu-re-ka:master
Branches Tags
yu-re-ka:master
lheckemann:master

No commits in common. "master" and "master" have entirely different histories.
master ... master

2 changed files with 22 additions and 28 deletions
Show stats Expand all files Collapse all files

4
modules/default.nix
View file

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

46
pkgs/tvix/default.nix
View file

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