gnutls: Fix failing patch for Aarch32#117051
gnutls: Fix failing patch for Aarch32#117051matthewmazzanti wants to merge 2 commits intoNixOS:stagingfrom
Conversation
A patch for tests that fail on arm has been upstreamed, and is no longer needed. I have gated this behind a lib.versionOlder to allow the build.
|
Why add the versionOlder and not just drop the patch? |
|
In the same file theres a "versionAtLeast" here, so I wanted to keep with the flow and maintain the ability to change versions if needed. If it would be more appropriate to just drop the patch, let me know. |
|
We only tend to do that for packages with a common infrastructure that multiple versions are built from. Apparently this used to be the case for gnutls until 33e7d72/#58611. IMHO having conditions which only ever evaluate to the same result is an antipattern and should be avoided, but if it is to be expected that a |
|
Well I can remove the patch entirely, thats no problem. Do you want me to remove the other version dependent reference as well, or leave it in? |
|
Removed the patch. |
|
Can we target master here? |
|
Tried to change the base directly and it looked nasty. Let me do a cherry pick and open a new PR. |
|
New pr here: #117279 |
Motivation for this change
A patch for tests that fail on arm has been upstreamed, and is no longer
needed.
Things done
I have gated this behind a lib.versionOlder to allow the build.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)