Skip to content

Comments

gnutls: Fix failing patch for Aarch32#117051

Closed
matthewmazzanti wants to merge 2 commits intoNixOS:stagingfrom
matthewmazzanti:fix-gnutls-cross
Closed

gnutls: Fix failing patch for Aarch32#117051
matthewmazzanti wants to merge 2 commits intoNixOS:stagingfrom
matthewmazzanti:fix-gnutls-cross

Conversation

@matthewmazzanti
Copy link
Contributor

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.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

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.
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 20, 2021
@ajs124
Copy link
Member

ajs124 commented Mar 21, 2021

Why add the versionOlder and not just drop the patch?

@matthewmazzanti
Copy link
Contributor Author

matthewmazzanti commented Mar 21, 2021

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.

@ajs124
Copy link
Member

ajs124 commented Mar 21, 2021

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 generic.nix and multiple different gnutls versions will return, it might make sense to keep them around anyways.

@matthewmazzanti
Copy link
Contributor Author

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?

@matthewmazzanti
Copy link
Contributor Author

Removed the patch.

@SuperSandro2000
Copy link
Member

Can we target master here?

@matthewmazzanti matthewmazzanti changed the base branch from staging to master March 22, 2021 20:49
@matthewmazzanti matthewmazzanti changed the base branch from master to staging March 22, 2021 20:50
@matthewmazzanti
Copy link
Contributor Author

Tried to change the base directly and it looked nasty. Let me do a cherry pick and open a new PR.

@matthewmazzanti
Copy link
Contributor Author

New pr here: #117279

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants