cargo-deb: 1.24.0 -> 1.29.1 + build fix#114311
Merged
Ma27 merged 3 commits intoNixOS:masterfrom Feb 25, 2021
Merged
Conversation
The `checkType` attribute does not apply after NixOS#113193, and since we're changing tests anyway, let's run them in the release mode to avoid the need for `checkType`. This fixes the otherwise broken build.
ofborg
bot
added
10.rebuild-darwin: 1-10
bobrik
force-pushed
the
ivan/cargo-deb-1.29.1
branch
2 times, most recently
from
bc9dbad to
dbad57a
Compare
Contributor
Author
|
Addressed the Linux build failure. |
Member
There was a problem hiding this comment.
Can we use an upstream tag?
Contributor
Author
There was a problem hiding this comment.
Seems like a good idea, updated.
The test was introduced in v1.25.0: * mmstick/cargo-deb@3597cf28e
bobrik
force-pushed
the
ivan/cargo-deb-1.29.1
branch
from
dbad57a to
a422684
Compare
Mic92
reviewed
Feb 25, 2021
Comment on lines
+29
to
+30
| substituteInPlace src/dependencies.rs \ | ||
| --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' |
Member
There was a problem hiding this comment.
To make this more ryantm-r friendly as the error is only detected at runtime, can we make this a patch instead?
Contributor
Author
There was a problem hiding this comment.
It's detected at build time, during the test. Nothing changes for runtime here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The
checkTypeattribute does not apply after #113193, and since we're changing tests anyway, let's run them in the release mode to avoid the need forcheckType.This fixes the otherwise broken build.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)