mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/overlays/tvl): switch to nixpkgs crate2nix

Browse source 
Since a recent nixpkgs bump bringing a version of cargo with
https://github.com/rust-lang/cargo/pull/12914,
crate2nix creates a crate-hashes.json with all crate hashes from
Cargo.lock (and downloads a lot of stuff while producing it).

https://github.com/nix-community/crate2nix/pull/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 <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Florian Klink 2024-05-03 00:19:08 +03:00 committed by clbot
parent 7a7532d053
commit b8e82a42ed
3 changed files with 10 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
third_party/overlays/tvl.nix vendored
View file

@ -97,44 +97,12 @@ depot.nix.readTree.drvTargets {
]; ];
}); });
crate2nix = super.rustPlatform.buildRustPackage rec { crate2nix = super.crate2nix.overrideAttrs (old: {
pname = "crate2nix"; patches = old.patches or [ ] ++ [
version = "0.13.0"; # https://github.com/nix-community/crate2nix/pull/301
src = super.fetchFromGitHub {
owner = "nix-community";
repo = "crate2nix";
rev = "ceb06eb7e76afb9e01a5f069aae136f97df72730";
hash = "sha256-JTMe8GViCQt51WUiaaoIPmWtwEeeYrl6pBxo2DNuKig=";
};
patches = [
./patches/crate2nix-tests-debug.patch ./patches/crate2nix-tests-debug.patch
./patches/crate2nix-run-tests-in-build-source.patch
]; ];
});
sourceRoot = "${src.name}/crate2nix";
cargoHash = "sha256-dhlSXY1CJE+JJt+6Y7W1MVMz36nwr6ny543py1TcjyY=";
nativeBuildInputs = [ super.makeWrapper ];
# Tests use nix(1), which tries (and fails) to set up /nix/var inside the
# sandbox
doCheck = false;
postFixup = ''
wrapProgram $out/bin/crate2nix \
--suffix PATH ":" ${lib.makeBinPath (with self; [ cargo nix_latest nix-prefetch-git ])}
rm -rf $out/lib $out/bin/crate2nix.d
mkdir -p \
$out/share/bash-completion/completions \
$out/share/zsh/vendor-completions
$out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions
$out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions
'';
};
evans = super.evans.overrideAttrs (old: { evans = super.evans.overrideAttrs (old: {
patches = old.patches or [ ] ++ [ patches = old.patches or [ ] ++ [

7
tvix/Cargo.nix
View file

@ -1,4 +1,4 @@
# This file was @generated by crate2nix 0.13.0 with the command: # This file was @generated by crate2nix 0.14.0 with the command:
# "generate" "--all-features" # "generate" "--all-features"
# See https://github.com/kolloch/crate2nix for more info. # See https://github.com/kolloch/crate2nix for more info.
@ -17085,8 +17085,9 @@ rec {
# because we compiled those test binaries in the former and not the latter. # 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. # 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. # 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` # NOTE: There could be edge cases if `crate.sourceRoot` does exist but
# do exist but it's very hard to reason about them, so let's wait until the first bug report. # it's very hard to reason about them.
# Open a bug if you run into this!
mkdir -p source/ mkdir -p source/
cd source/ cd source/

4
tvix/crate-hashes.json
View file

@ -1,4 +1,4 @@
{ {
"bigtable_rs 0.2.9 (git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0af404741dfc40eb9fa99cf4d4140a09c5c20df7)": "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll", "git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0.2.9": "1njjam1lx2xlnm7a41lga8601vmjgqz0fvc77x24gd04pc7avxll",
"wu-manber 0.1.0 (git+https://github.com/tvlfyi/wu-manber.git#0d5b22bea136659f7de60b102a7030e0daaa503d)": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" "git+https://github.com/tvlfyi/wu-manber.git#wu-manber@0.1.0": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd"
} }