From 15c38e737871ed87714ad36b60d043f2d6a3b9aa Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 4 Nov 2024 16:38:40 -0800
Subject: [PATCH 1/2] cargo-llvm-cov: fix tests (and thus the build)

---
 pkgs/by-name/ca/cargo-llvm-cov/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 2672d165b26d..5f291123be01 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -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
@@ -20,7 +18,7 @@
 , fetchurl
 , fetchFromGitHub
 , rustPlatform
-, rustc
+, llvmPackages_19
 , git
 }:
 
@@ -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 {

From fc6278d271c7e23367c9525356e354179b467d3f Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Mon, 4 Nov 2024 16:43:46 -0800
Subject: [PATCH 2/2] cargo-llvm-cov: 0.6.12 -> 0.6.14

---
 pkgs/by-name/ca/cargo-llvm-cov/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
index 5f291123be01..7f55d8e7f814 100644
--- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
@@ -24,7 +24,7 @@
 
 let
   pname = "cargo-llvm-cov";
-  version = "0.6.12";
+  version = "0.6.14";
 
   owner = "taiki-e";
   homepage = "https://github.com/${owner}/${pname}";
@@ -35,7 +35,7 @@ let
   cargoLock = fetchurl {
     name = "Cargo.lock";
     url = "https://crates.io/api/v1/crates/${pname}/${version}/download";
-    sha256 = "sha256-QMO5J5c8MQr84w6X74oQrHV99cjSUVfpC8Ub1csQ0gI=";
+    sha256 = "sha256-f0xO+UxB9f6q6q8QyjtP+z+U146+8GLmLKgGmAs/YYA=";
     downloadToTemp = true;
     postFetch = ''
       tar xzf $downloadedFile ${pname}-${version}/Cargo.lock
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage {
     inherit owner;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BlXgbCWjGya/I94nqfjBqQPSWnVhyhNn0oSRL9xiS6k=";
+    sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg=";
   };
 
   # Upstream doesn't include the lockfile so we need to add it back
@@ -61,7 +61,7 @@ rustPlatform.buildRustPackage {
     cp ${cargoLock} source/Cargo.lock
   '';
 
-  cargoHash = "sha256-nabO19JePQRuhxsbm5wVIU4+5si6p0VgqR2QLmLeivU=";
+  cargoHash = "sha256-kYKQ7ddgoSvarF0HG/yESu5cU87DUgYm9tDkem5a/gw=";
 
   # `cargo-llvm-cov` reads these environment variables to find these binaries,
   # which are needed to run the tests