zerotierone: Use pre-vendored cargo dependencies #193093
Merged
Conversation
This file contains 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
ofborg
bot
requested review from
danielfullmer,
sjmackenzie,
zimbatm,
ehmry and
obadz
|
Result of 1 package built:
|
zimbatm
reviewed
Sep 27, 2022
| @@ -41,12 +34,15 @@ in stdenv.mkDerivation { | |||
| substituteInPlace ./make-linux.mk \ | |||
| --replace '-march=armv6zk' "" \ | |||
| --replace '-mcpu=arm1176jzf-s' "" | |||
|
|
|||
There was a problem hiding this comment.
can you add a comment that links back to more context, like the upstream issue? All the rest looks good.
There was a problem hiding this comment.
Huh? I don't think there is an upstream issue here? I'm of the impression this is a packaging issue here and not an upstream issue. However, I can add some more details to clarify why it's needed.
There was a problem hiding this comment.
@zimbatm does that work?
There was a problem hiding this comment.
thanks, it will help with the next release
ZeroTierOne already vendors the dependencies for us, so there is no point in doing it twice. Unfortunately, the ZeroTierOne developers forgot to specify rust-jwt in the cargo configuration file, so we have to manually do that to allow it to work as intended.
zimbatm
approved these changes
Sep 27, 2022
| @@ -41,12 +34,15 @@ in stdenv.mkDerivation { | |||
| substituteInPlace ./make-linux.mk \ | |||
| --replace '-march=armv6zk' "" \ | |||
| --replace '-mcpu=arm1176jzf-s' "" | |||
|
|
|||
There was a problem hiding this comment.
thanks, it will help with the next release
Janik-Haag
added
the
12. first-time contribution
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes
ZeroTierOne already vendors the dependencies for us, so there is no point in doing it twice. Unfortunately, the ZeroTierOne developers forgot to specify rust-jwt in the cargo configuration file, so we have to manually do that to allow it to work as intended. Fixes #192056
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