about summary refs log tree commit diff
path: root/third_party
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-09-26T06·50+0300
committerclbot <clbot@tvl.fyi>2023-09-26T10·03+0000
commit10717605a2ceb736d1c1ad215f8a92ef30dd85c3 (patch)
tree4348ceeb75fb028348746b9ef57c300d26857a2e /third_party
parent15a3eca321c7f02da26df3c2ae4acc7a3f07f18e (diff)
chore(third_party/crate2nix): bump crate2nix to current HEAD r/6657
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 <tvl@lahfa.xyz>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party')
-rw-r--r--third_party/overlays/tvl.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 69b119a48959..ec7506ee4107 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=";
     });
   });
 }