cargo-llvm-cov: init at 0.4.13#185183
Conversation
ee39021 to
ea23e3e
Compare
DieracDelta
left a comment
There was a problem hiding this comment.
LGTM, the fetchcrate seems like it fixes ofborg. Excited to see this in nixpkgs!
0990b64 to
0dd9655
Compare
0dd9655 to
098b50d
Compare
|
@FliegendeWurst unfortunately, your workaround does not work anymore with 0.4.14... care to investigate? |
winterqt
left a comment
There was a problem hiding this comment.
What I'm confused about is that this should have never worked in the first place, for a few reasons:
- Your hash for the crate source is wrong (off by one character).
- Your patch for copying the
Cargo.lockdoesn't apply to the dependency tarball generation, which means the build still fails. - The tests depend on a nightly compiler, which we don't ship (and
rustPlatformdoesn't use).
Due to these reasons, I propose the following solution, which I have locally and can push if you'd like (or you can make the changes yourself):
- Only use the crate source, we don't care about the tests fixtures
rm test/tests.rsinpostPatch, to stop the tests that require nightly from running
Making these changes locally has this building successfully for me.
098b50d to
c026e6c
Compare
37467fd to
da809fa
Compare
|
With your changes, this fails now with: |
|
Ugh, sorry, made a typo in my original message and didn't notice before repeating it: it should be |
|
I'm gonna use fixup patches for now and squash once all of you approve. |
Co-authored-by: Justin Restivo <justin@restivo.me> Co-authored-by: FliegendeWurst <2012gdwu+github@posteo.de> Co-authored-by: Winter <winter@winter.cafe> Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
6b546c0 to
9caa413
Compare
|
Any chance we get this merged? I would love to drop my overlays for this and pull directly from nixpkgs. |
| ''; | ||
|
|
||
| nativeBuildInputs = [ makeBinaryWrapper ]; | ||
| buildInputs = [ libllvm ]; |
There was a problem hiding this comment.
Should this use the same libllvm as rustc (e.g. rustPlatform.rust.rustc.llvmPackages.libllvm)?
There was a problem hiding this comment.
Not sure if this is different because it's an older version, but I didn't need to add any buildInputs at all to get 0.5.0 to build/function.
There was a problem hiding this comment.
Yeah, looks like libllvm was never required, at least on 0.4.13.
@DieracDelta Do you remember why you added it, out of curiosity?
There was a problem hiding this comment.
I have no recollection of adding this. If it works without libllvm, then let's drop the dependency 👍
|
I'm happy to merge this after #185183 (comment) is figured out. I don't see why we shouldn't use the same version (smaller closure size and all), but maybe it matters? Apologies for forgetting about this PR. |
|
Is there any reason not to update this PR to init at upstream's 0.5.0? |
|
I'm going to close this in favor of #197478, because it has all the tests working, and does not wrap the binary (and is the latest version). Thanks to everyone who got this implementation where it was, and if you can see anything in there that's worth a review, don't hesitate to comment there :) |
Closes #170938
Supersedes #170938
Things done
sandbox = trueset 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/)nixos/doc/manual/md-to-db.shto update generated release notes