diff options
Diffstat (limited to 'users/picnoir/tvix-daemon')
| -rw-r--r-- | users/picnoir/tvix-daemon/Cargo.lock | 1 | ||||
| -rw-r--r-- | users/picnoir/tvix-daemon/Cargo.nix | 25 |
2 files changed, 22 insertions, 4 deletions
diff --git a/users/picnoir/tvix-daemon/Cargo.lock b/users/picnoir/tvix-daemon/Cargo.lock index cdbb82e37ae2..5522c63032a2 100644 --- a/users/picnoir/tvix-daemon/Cargo.lock +++ b/users/picnoir/tvix-daemon/Cargo.lock @@ -763,6 +763,7 @@ dependencies = [ "glob", "nom", "num-traits", + "pin-project-lite", "serde", "serde_json", "sha2", diff --git a/users/picnoir/tvix-daemon/Cargo.nix b/users/picnoir/tvix-daemon/Cargo.nix index 14fd16afb03d..aa3faf4a8986 100644 --- a/users/picnoir/tvix-daemon/Cargo.nix +++ b/users/picnoir/tvix-daemon/Cargo.nix @@ -1,5 +1,5 @@ -# This file was @generated by crate2nix 0.12.0 with the command: -# "generate" +# This file was @generated by crate2nix 0.13.0 with the command: +# "generate" "--all-features" # See https://github.com/kolloch/crate2nix for more info. { nixpkgs ? <nixpkgs> @@ -2373,6 +2373,11 @@ rec { packageId = "num-traits"; } { + name = "pin-project-lite"; + packageId = "pin-project-lite"; + optional = true; + } + { name = "serde"; packageId = "serde"; features = [ "derive" ]; @@ -2403,11 +2408,12 @@ rec { } ]; features = { - "async" = [ "futures-util" "tokio" ]; + "async" = [ "futures-util" "tokio" "pin-project-lite" ]; "futures-util" = [ "dep:futures-util" ]; + "pin-project-lite" = [ "dep:pin-project-lite" ]; "tokio" = [ "dep:tokio" ]; }; - resolvedDefaultFeatures = [ "async" "futures-util" "tokio" ]; + resolvedDefaultFeatures = [ "async" "futures-util" "pin-project-lite" "tokio" ]; }; "nom" = rec { crateName = "nom"; @@ -5205,6 +5211,7 @@ rec { ( _: { buildTests = true; + release = false; } ); # If the user hasn't set any pre/post commands, we don't want to @@ -5229,6 +5236,16 @@ rec { # recreate a file hierarchy as when running tests with cargo # the source for test data + # It's necessary to locate the source in $NIX_BUILD_TOP/source/ + # instead of $NIX_BUILD_TOP/ + # because we compiled those test binaries in the former and not the latter. + # So all paths will expect source tree to be there and not in the build top directly. + # For example: $NIX_BUILD_TOP := /build in general, if you ask yourself. + # TODO(raitobezarius): I believe there could be more edge cases if `crate.sourceRoot` + # do exist but it's very hard to reason about them, so let's wait until the first bug report. + mkdir -p source/ + cd source/ + ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src} # build outputs |