From 10717605a2ceb736d1c1ad215f8a92ef30dd85c3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 26 Sep 2023 09:50:23 +0300 Subject: chore(third_party/crate2nix): bump crate2nix to current HEAD This will bring conditional features support. Also invoke crate2nixgenerate with the --all-features argument, so all dependencies, including the ones for optional features are included in the Cargo.nix file. Change-Id: I3bbcb200c9b481f660db89efba650ea4f7418a63 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9470 Reviewed-by: raitobezarius Autosubmit: flokli Tested-by: BuildkiteCI --- third_party/overlays/tvl.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'third_party/overlays') diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 69b119a489..ec7506ee41 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -1,6 +1,6 @@ # This overlay is used to make TVL-specific modifications in the # nixpkgs tree, where required. -{ depot, localSystem, ... }: +{ lib, depot, localSystem, ... }: self: super: let @@ -109,20 +109,20 @@ depot.nix.readTree.drvTargets { })); # Pin a newer version of crate2nix from git, which is not officially - # released but supports `dep:` + # released but supports `dep:` and conditional features crate2nix = super.crate2nix.overrideAttrs (old: rec { - version = "0.11.0-rc.1"; + version = "unstable-2023-09-26"; src = self.fetchFromGitHub { - owner = "kolloch"; + owner = "nix-community"; repo = "crate2nix"; - rev = "v0.11.0-rc.1"; - hash = "sha256:02yvn61w16sgkdxa019l5y9i2ybyk8h4516718gmarqxx5ws2kz8"; + rev = "8a33aec8795dcc98afbb0cd1030bb1c939ede211"; + hash = "sha256-eFT2SUxTopxEvW0rcxSjQU6nbrQLI2FbyaVgtV8oiTk="; }; cargoDeps = old.cargoDeps.overrideAttrs (_: { inherit src; - outputHash = "sha256:03yny9ikqzfpi2mr27r82g54an2s8k9lqi2i4fqalg7g0s2cr2yd"; + outputHash = "sha256-elEIWHxyY3iccprIcbQA6GWFiq/n5kozpGfw/OmoSIg="; }); }); } -- cgit 1.4.1