diff options
author | Charles Hall <charles@computer.surgery> | 2023-10-31 08:22:39 -0700 |
---|---|---|
committer | Charles Hall <charles@computer.surgery> | 2023-10-31 08:22:39 -0700 |
commit | a946f9e71def31553664173ed5868a9401e62cb6 (patch) | |
tree | 8ab464c945e87fb9993cea3595a07ed13a74c18d /pkgs/development/tools/rust | |
parent | b67d49726047b20713c3a48710d7459031ff361f (diff) | |
download | nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar.gz nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar.bz2 nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar.lz nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar.xz nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.tar.zst nixpkgs-a946f9e71def31553664173ed5868a9401e62cb6.zip |
cargo-llvm-cov: 0.5.33 -> 0.5.34
`cargo-llvm-cov` changed up its test suite a bit so we need to account for those changes too.
Diffstat (limited to 'pkgs/development/tools/rust')
-rw-r--r-- | pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index f591540785c..380bf2635bc 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -21,11 +21,12 @@ , fetchFromGitHub , rustPlatform , rustc +, git }: let pname = "cargo-llvm-cov"; - version = "0.5.33"; + version = "0.5.34"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -36,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk="; + sha256 = "sha256-lPcJ266XeslaxGOb88RbmZKJrg0YlD4HGPqBEkr4bKI="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -54,7 +55,8 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU="; + sha256 = "sha256-DWDT2B/eyqI0hLgswplzxDYn29iLCxhvV/aGMHikPCo="; + leaveDotGit = true; }; # Upstream doesn't include the lockfile so we need to add it back @@ -62,13 +64,24 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ="; + cargoSha256 = "sha256-7zXLLF3HL6fA1DVwwilOZ9D+iCnRKvSORl6O0wd+vw0="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests LLVM_COV = "${llvm}/bin/llvm-cov"; LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + nativeCheckInputs = [ + git + ]; + + 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 . + ''; + meta = { inherit homepage; changelog = homepage + "/blob/v${version}/CHANGELOG.md"; |