Skip to content

Comments

gnutls: Fix failing patch when cross compiling to Arm32#117279

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

gnutls: Fix failing patch when cross compiling to Arm32#117279
matthewmazzanti wants to merge 2 commits intoNixOS:masterfrom
matthewmazzanti:fix-gnutls-cross-master

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

Remove the patch

  • 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.
@matthewmazzanti matthewmazzanti changed the title gnutls: Fix cross compiling gnutls: Fix failing patch when cross compiling to Arm32 Mar 22, 2021
@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 22, 2021
@vcunat
Copy link
Member

vcunat commented Mar 24, 2021

The patch wasn't failing (I first thought you meant that) but perhaps it isn't needed anymore. The cross-compilation I tried works both before and after this PR.

--arg crossSystem '(import ./lib).systems.examples.armv7l-hf-multiplatform'

@vcunat
Copy link
Member

vcunat commented Apr 16, 2021

With gnutls 3.7.1 the patch no longer applied and was removed in #119590

@vcunat vcunat closed this Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

2 participants