ruby-grpc: Only apply the GCC 14 patch if it’s not upstream #368732
+11
−11
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
github-actions
bot
added
6.topic: ruby
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
labels
paparodeo
reviewed
Dec 28, 2024
It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors. Signed-off-by: Anders Kaseorg <[email protected]>
paparodeo
approved these changes
Dec 28, 2024
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/5019 |
wegank
added
the
12.approvals: 1
|
Closes: #370158 ? |
|
@devurandom Yes, added. |
| env = lib.optionalAttrs (lib.versionOlder attrs.version "1.68.1") { | ||
| NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; | ||
| }; | ||
| patches = lib.optional (lib.versionOlder attrs.version "1.65.0") (fetchpatch { |
There was a problem hiding this comment.
Please, prefer using lib.optionals instead of optional. It allows for adding new items later on with a minimal diff.
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.
It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.