-
-
Notifications
You must be signed in to change notification settings - Fork 13.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cargo-llvm-cov: 0.5.33 -> 0.5.35 #261650
cargo-llvm-cov: 0.5.33 -> 0.5.35 #261650
Conversation
Result of 1 package failed to build:
1 test failed:failures: |
Yep, help would be appreciated! |
Still not working for the same reasons as before. |
This part of the release broke the tests for us: taiki-e/cargo-llvm-cov@v0.5.33...v0.5.34#diff-1e945b89ea291b412e6b40b574d24c7335a61b6b3745d734e946975134c44cadR131 This helps but doesn't fix it: diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
index b384187c8d14..33251230b199 100644
--- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@@ -21,6 +21,7 @@
, fetchFromGitHub
, rustPlatform
, rustc
+, git
}:
let
@@ -54,7 +55,8 @@ rustPlatform.buildRustPackage {
inherit owner;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ux4vVpejMkHwXxYS+LGoJufb4CiBHU7jjLX8glubnVU=";
+ sha256 = "sha256-059k2z+ZtpWgZjoFZKIHF+OHYnBcUUO/4REWW5XRHkw=";
+ leaveDotGit = true;
};
# Upstream doesn't include the lockfile so we need to add it back
@@ -69,6 +71,10 @@ rustPlatform.buildRustPackage {
LLVM_COV = "${llvm}/bin/llvm-cov";
LLVM_PROFDATA = "${llvm}/bin/llvm-profdata";
+ nativeCheckInputs = [
+ git
+ ];
+
meta = {
inherit homepage;
changelog = homepage + "/blob/v${version}/CHANGELOG.md"; After applying that patch, I'm now I'm seeing errors like:
Doing some |
The secret sauce was
because for some reason doing
and then looking at the logs. Pretty surprising behavior, if you ask me. Anyway, this matters for Click to expand fully working patchdiff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
index b384187c8d14..d9a1d5c10d07 100644
--- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@@ -21,6 +21,7 @@
, fetchFromGitHub
, rustPlatform
, rustc
+, git
}:
let
@@ -54,7 +55,8 @@ rustPlatform.buildRustPackage {
inherit owner;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ux4vVpejMkHwXxYS+LGoJufb4CiBHU7jjLX8glubnVU=";
+ sha256 = "sha256-059k2z+ZtpWgZjoFZKIHF+OHYnBcUUO/4REWW5XRHkw=";
+ leaveDotGit = true;
};
# Upstream doesn't include the lockfile so we need to add it back
@@ -69,6 +71,14 @@ rustPlatform.buildRustPackage {
LLVM_COV = "${llvm}/bin/llvm-cov";
LLVM_PROFDATA = "${llvm}/bin/llvm-profdata";
+ nativeCheckInputs = [
+ git
+ ];
+
+ preCheck = ''
+ git restore --staged .
+ '';
+
meta = {
inherit homepage;
changelog = homepage + "/blob/v${version}/CHANGELOG.md"; Also, https://github.com/taiki-e/cargo-llvm-cov/releases/tag/v0.5.36 exists now. |
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Can you send the patches to me or give me an URL to pull from? I also am in the process of packaging the update to 0.5.36. |
Signed-off-by: Matthias Beyer <[email protected]>
c23dfe1
to
e294f3b
Compare
I put it in #261650 (comment), you should be able to just copy it to your clipboard and then do Also, you should include this patch in the first commit and then carry it through all the other commits, so that each one can build properly. Keep in mind you'll have to update the hash every time. |
Yeah please provide something I can pull from. That's less hassle for everyone and even preserves credit to you. If I apply the changes from your above fix, the issue is not fixed ( |
I think that means you forgot to change the hash for Anyway, I opened #264606 since it takes 2 extra seconds to open a PR after doing the work of carrying the patch through all the updates, making commits for this, and pushing them somewhere. |
Hey, matthiasbeyer, sorry for the hostility in the previous comment. Also, apologies for putting any nixpkgs committers who saw this into the awkward position of trying to figure out whether to go ahead with one of these, and if so, which one. To get things moving again, do you want to pull the changes/commits from #264606 into this PR and have me close that, or do you want to close this one in favor of that one? Personally, I'm okay with either option, I have no preference. |
Don't worry too much about it. |
Description of changes
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)