Skip to content

Commit 949a622

Browse files
flokliclbot
authored and
clbot
committed
chore(3p/overlays/tvl): switch to nixpkgs crate2nix
Since a recent nixpkgs bump bringing a version of cargo with rust-lang/cargo#12914, crate2nix creates a crate-hashes.json with all crate hashes from Cargo.lock (and downloads a lot of stuff while producing it). nix-community/crate2nix#341 prevents this from happening, but our hardcoded crate2nix pin prevented us from getting the fix included in 0.14.0, which did land in nixpkgs. Replace the pin with a simply override, carrying our only leftover patch on top of it, and link to that PR. Change-Id: I9503898e15d61fa6a2b1589d141bec1b4ed3d616 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11581 Autosubmit: flokli <[email protected]> Tested-by: BuildkiteCI Reviewed-by: sterni <[email protected]>
1 parent 3e6a657 commit 949a622

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Cargo.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was @generated by crate2nix 0.13.0 with the command:
1+
# This file was @generated by crate2nix 0.14.0 with the command:
22
# "generate" "--all-features"
33
# See https://github.com/kolloch/crate2nix for more info.
44

@@ -17085,8 +17085,9 @@ rec {
1708517085
# because we compiled those test binaries in the former and not the latter.
1708617086
# So all paths will expect source tree to be there and not in the build top directly.
1708717087
# For example: $NIX_BUILD_TOP := /build in general, if you ask yourself.
17088-
# TODO(raitobezarius): I believe there could be more edge cases if `crate.sourceRoot`
17089-
# do exist but it's very hard to reason about them, so let's wait until the first bug report.
17088+
# NOTE: There could be edge cases if `crate.sourceRoot` does exist but
17089+
# it's very hard to reason about them.
17090+
# Open a bug if you run into this!
1709017091
mkdir -p source/
1709117092
cd source/
1709217093

crate-hashes.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"bigtable_rs 0.2.9 (git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0af404741dfc40eb9fa99cf4d4140a09c5c20df7)": "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll",
3-
"wu-manber 0.1.0 (git+https://github.com/tvlfyi/wu-manber.git#0d5b22bea136659f7de60b102a7030e0daaa503d)": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd"
2+
"git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0.2.9": "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll",
3+
"git+https://github.com/tvlfyi/wu-manber.git#[email protected]": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd"
44
}

0 commit comments

Comments
 (0)