Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coreutils, findutils, gnutls: fix build on 32-bit ARM #103925

Merged
merged 3 commits into from Dec 8, 2020

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

Adds an upstream patch to fix tests that fail on 32-bit ARM. The patch actually affects gnulib, which is included as a vendored dependency.

I only applied the patch to 32-bit ARM so this could go in master, but we need to remember to remove it when updating.

cc @edolstra @NeQuissimus @dtzWill

Things done
  • 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.

Adds an upstream patch to fix failing tests. The patch actually affects gnulib,
which is included as a vendored dependency.
Add an upstream patch to fix failing tests. The patch actually affects gnulib,
which is included as a vendored dependency.
@lopsided98
Copy link
Contributor Author

findutils also needs the same patch. I made a copy of the patch, so that we don't have to worry about someone deleting it while another package is still using it.

I'm not sure if there are other packages that use gnulib and need this patch.

@lopsided98 lopsided98 changed the title coreutils: fix build on 32-bit ARM coreutils, findutils: fix build on 32-bit ARM Nov 15, 2020
Copy link
Member

@thefloweringash thefloweringash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built ok on armv7l-linux. This is a backport of an upstream change that's preventing building almost anything on armv7l-linux. LGTM.

Add an upstream patch to fix failing tests. The patch actually affects gnulib,
which is included as a vendored dependency.
@lopsided98 lopsided98 changed the title coreutils, findutils: fix build on 32-bit ARM coreutils, findutils, gnutls: fix build on 32-bit ARM Nov 22, 2020
@lopsided98
Copy link
Contributor Author

I found that gnutls needs the same fix.

@thefloweringash
Copy link
Member

I started an evaluation on my hydra: https://hydra.cons.org.nz/eval/3297?compare=nixpkgs-unstable

@Fuseteam
Copy link
Contributor

only mtdutils seems to be failing

@lopsided98
Copy link
Contributor Author

That looks like an unrelated issue.

Copy link
Member

@sorki sorki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thank you for this!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/294

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants