From 210b4277b6d25c742174d74a13ad5b4313b83955 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 17 Jun 2024 16:23:35 +0300 Subject: [PATCH] chore(tvix): Use callPackage instead of import on Cargo.nix Since crate2nix v0.11 the new preferred way of importing Cargo.nix is with callPackage instead of import. Change-Id: Ifcc5c21e6c101cb9d0b3f1e8025b5ddb8cf99f20 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11855 Tested-by: BuildkiteCI Reviewed-by: flokli Autosubmit: Ilan Joselevich --- tvix/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tvix/default.nix b/tvix/default.nix index 98e9fd01e..d082e955d 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -32,10 +32,7 @@ let }; # Load the crate2nix crate tree. - crates = import ./Cargo.nix { - inherit pkgs; - nixpkgs = pkgs.path; - + crates = pkgs.callPackage ./Cargo.nix { defaultCrateOverrides = pkgs.defaultCrateOverrides // { zstd-sys = prev: { nativeBuildInputs = prev.nativeBuildInputs or [ ];