From 89708930c4e2bfc038fc9cc4532c3e2aa416bf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Tue, 16 Apr 2024 10:17:59 +0200 Subject: [PATCH] cargo-llvm-cov: don't use leaveDotGit --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index a9a45c48a5e6..da2ed090392e 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -55,8 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-mNpZj8c+IHcW0StFzRPt7wcysADh01eLFcIK6fX/2KQ="; - leaveDotGit = true; + sha256 = "sha256-fZrYmsulKOvgW/WtsYL7r4Cby+m9ShgXozxj1ZQ5ZAY="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -75,11 +74,10 @@ rustPlatform.buildRustPackage { git ]; + # `cargo-llvm-cov` tests rely on `git ls-files. preCheck = '' - # `cargo-llvm-cov`'s tests rely on `git ls-files` so the staging area needs - # to not have everything staged as deleted, which is how `leaveDotGit` in - # `fetchFromGitHub` leaves the staging area for reproducibility reasons. - git restore --staged . + git init -b main + git add . ''; meta = {