From 9825404388d077f28d5a3d1fd7dca4281492562b Mon Sep 17 00:00:00 2001 From: Picnoir Date: Mon, 8 Apr 2024 12:33:44 +0200 Subject: refactor(tvix/nix-compat): move handshake function to nix-compat Moving out the handshake route out of tvix-daemon to nix-compat. We're bumping the protocol to version 37. It does not change anything for us. Version 37 introduced a change in the build result serialization. We do not implement that for now. Tested tvix-daemon against Nix via the integration test to make sure we did not break anything in the process. Taking advantage of this refactor to remove the unused anyhow dependency in tvix-daemon. Change-Id: I8a2aad0b6dbb0aaa997446a612a365fd7d70336c Reviewed-on: https://cl.tvl.fyi/c/depot/+/11379 Tested-by: BuildkiteCI Reviewed-by: flokli --- users/picnoir/tvix-daemon/Cargo.nix | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'users/picnoir/tvix-daemon/Cargo.nix') diff --git a/users/picnoir/tvix-daemon/Cargo.nix b/users/picnoir/tvix-daemon/Cargo.nix index aa3faf4a8986..8dc9b541757b 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.13.0 with the command: -# "generate" "--all-features" +# This file was @generated by crate2nix 0.12.0 with the command: +# "generate" # See https://github.com/kolloch/crate2nix for more info. { nixpkgs ? @@ -229,20 +229,6 @@ rec { ]; }; - "anyhow" = rec { - crateName = "anyhow"; - version = "1.0.81"; - edition = "2018"; - sha256 = "0ivj2k7vajai9hc11lhjp73n6rqs1ykg6wbjjjl1mz9adj580lh9"; - authors = [ - "David Tolnay " - ]; - features = { - "backtrace" = [ "dep:backtrace" ]; - "default" = [ "std" ]; - }; - resolvedDefaultFeatures = [ "default" "std" ]; - }; "async-stream" = rec { crateName = "async-stream"; version = "0.3.5"; @@ -4159,10 +4145,6 @@ rec { then lib.cleanSourceWith { filter = sourceFilter; src = ./.; } else ./.; dependencies = [ - { - name = "anyhow"; - packageId = "anyhow"; - } { name = "clap"; packageId = "clap"; @@ -5211,7 +5193,6 @@ rec { ( _: { buildTests = true; - release = false; } ); # If the user hasn't set any pre/post commands, we don't want to @@ -5236,16 +5217,6 @@ 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 -- cgit 1.4.1