Fix aws-sdk-cpp patch to work with aws-sdk-cpp on 18.09+ #2485
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
shlevy
reviewed
Oct 27, 2018
| url = https://github.com/edolstra/aws-sdk-cpp/commit/3e07e1f1aae41b4c8b340735ff9e8c735f0c063f.patch; | ||
| sha256 = "1pij0v449p166f9l29x7ppzk8j7g9k9mp15ilh5qxp29c7fnvxy2"; | ||
| }) ]; | ||
| patches = args.patches or [] ++ [ ./transfermanager-content-encoding.patch ]; |
There was a problem hiding this comment.
I think you need (arg.patches or []) ++ ... 😭
There was a problem hiding this comment.
Apparently not! Seems to work as expected poking at it in nix repl:
nix-repl> a = { x = [ "bar" ]; }
nix-repl> a.x or [] ++ [ "foo" ]
[ "bar" "foo" ]
nix-repl> a = { y = [ "bar" ]; }
nix-repl> a.x or [] ++ [ "foo" ]
[ "foo" ]
shlevy
approved these changes
Oct 28, 2018
|
I've dropped the patch instead since we don't need it anymore (6323b07). |
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.
Current patch works with 18.03, not sure if this does--
it's a simple rebase as I recall.
I've started pinning aws-sdk-cpp to a specific version
to ensure the patch applies (and nix can be built),
but I didn't put much thought into it beyond getting
things to work :).