yu-re-ka/binary-cache
0
0
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

merge into: yu-re-ka:master
Branches Tags
yu-re-ka:master
lheckemann:master
...
pull from: lheckemann:master
Branches Tags
lheckemann:master
yu-re-ka:master

2 commits
master ... master

Author SHA1 Message Date
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
1 changed files with 8 additions and 7 deletions
Show stats Expand all files Collapse all files

15
pkgs/tvix/default.nix
View file

@ -11,22 +11,25 @@ rustPlatform.buildRustPackage rec {
inherit pname; inherit pname;
version = "0.1.0"; version = "0.1.0";
src = fetchgit { src = builtins.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=";
}; };
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 " " ( cargoBuildFlags = builtins.concatStringsSep " " (
@ -39,8 +42,6 @@ rustPlatform.buildRustPackage rec {
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;