mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 01:17:28 +03:00
Merge pull request #264606 from CobaltCause/cargo-llvm-cov
cargo-llvm-cov: 0.5.33 -> 0.5.36
This commit is contained in:
commit
4af30c40e2
@ -21,11 +21,12 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, rustc
|
, rustc
|
||||||
|
, git
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "cargo-llvm-cov";
|
pname = "cargo-llvm-cov";
|
||||||
version = "0.5.33";
|
version = "0.5.36";
|
||||||
|
|
||||||
owner = "taiki-e";
|
owner = "taiki-e";
|
||||||
homepage = "https://github.com/${owner}/${pname}";
|
homepage = "https://github.com/${owner}/${pname}";
|
||||||
@ -36,7 +37,7 @@ let
|
|||||||
cargoLock = fetchurl {
|
cargoLock = fetchurl {
|
||||||
name = "Cargo.lock";
|
name = "Cargo.lock";
|
||||||
url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
|
url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
|
||||||
sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk=";
|
sha256 = "sha256-ZI5vxtMcIEtVPIeedha3S6GEvvQDBB9eyOFwkAAO22I=";
|
||||||
downloadToTemp = true;
|
downloadToTemp = true;
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
|
tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
|
||||||
@ -54,7 +55,8 @@ rustPlatform.buildRustPackage {
|
|||||||
inherit owner;
|
inherit owner;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU=";
|
sha256 = "sha256-Ii21kjQ4nWEttvGY9bxhGmfLkI2MrAsYJZcwfE2y6uQ=";
|
||||||
|
leaveDotGit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Upstream doesn't include the lockfile so we need to add it back
|
# Upstream doesn't include the lockfile so we need to add it back
|
||||||
@ -62,13 +64,24 @@ rustPlatform.buildRustPackage {
|
|||||||
cp ${cargoLock} source/Cargo.lock
|
cp ${cargoLock} source/Cargo.lock
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ=";
|
cargoSha256 = "sha256-BHocUJpk4qplwMfpSXNTZjOpUCZGS676xYrqtSFnP7s=";
|
||||||
|
|
||||||
# `cargo-llvm-cov` reads these environment variables to find these binaries,
|
# `cargo-llvm-cov` reads these environment variables to find these binaries,
|
||||||
# which are needed to run the tests
|
# which are needed to run the tests
|
||||||
LLVM_COV = "${llvm}/bin/llvm-cov";
|
LLVM_COV = "${llvm}/bin/llvm-cov";
|
||||||
LLVM_PROFDATA = "${llvm}/bin/llvm-profdata";
|
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 = {
|
meta = {
|
||||||
inherit homepage;
|
inherit homepage;
|
||||||
changelog = homepage + "/blob/v${version}/CHANGELOG.md";
|
changelog = homepage + "/blob/v${version}/CHANGELOG.md";
|
||||||
|
Loading…
Reference in New Issue
Block a user