Skip to content

Commit

Permalink
cargo-llvm-cov: fix tests (and thus the build)
Browse files Browse the repository at this point in the history
  • Loading branch information
CobaltCause committed Nov 12, 2024
1 parent a541772 commit 15c38e7
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pkgs/by-name/ca/cargo-llvm-cov/package.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# If the tests are broken, it's probably for one of two reasons:
#
# 1. The version of llvm used doesn't match the expectations of rustc and/or
# cargo-llvm-cov. This is relatively unlikely because we pull llvm out of
# rustc's attrset, so it *should* be the right version as long as this is the
# case.
# cargo-llvm-cov.
# 2. Nixpkgs has changed its rust infrastructure in a way that causes
# cargo-llvm-cov to misbehave under test. It's likely that even though the
# tests are failing, cargo-llvm-cov will still function properly in actual
Expand All @@ -20,7 +18,7 @@
, fetchurl
, fetchFromGitHub
, rustPlatform
, rustc
, llvmPackages_19
, git
}:

Expand All @@ -31,7 +29,7 @@ let
owner = "taiki-e";
homepage = "https://github.com/${owner}/${pname}";

llvm = rustc.llvmPackages.llvm;
inherit (llvmPackages_19) llvm;

# Download `Cargo.lock` from crates.io so we don't clutter up Nixpkgs
cargoLock = fetchurl {
Expand Down

0 comments on commit 15c38e7

Please sign in to comment.