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

Jump to bottom

coreutils: Apply sys_getdents patch unconditionally #109331

Merged
merged 1 commit into from Jan 14, 2021
Merged

coreutils: Apply sys_getdents patch unconditionally #109331

merged 1 commit into from Jan 14, 2021

Conversation

zhaofengli
Copy link
Member

Motivation for this change

The new behavior in 8.32 for removed directories also breaks build for riscv64. Since the revert patch is already merged upstream, it should be safe to apply to all architectures.

Also see #101651.

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.

@ofborg ofborg bot requested a review from edolstra January 14, 2021 03:27
@cole-h
Copy link
Member

cole-h commented Jan 14, 2021

This should be based against the staging branch due to the large amount of rebuilds. See NixOS/ofborg#463 (comment) for a basic script / walkthrough on how to do this without pinging loads of code owners.

@zhaofengli zhaofengli changed the base branch from master to staging January 14, 2021 04:15
@zhaofengli
Copy link
Member Author

zhaofengli commented Jan 14, 2021 •
edited

Oops, looks like I failed :( Sorry for the pings. Should I remove the automatically added reviewers? (Edit: Well, I can't 🤷‍♂️ )

@cole-h cole-h removed the request for review from matthewbauer January 14, 2021 04:25
@cole-h
Copy link
Member

cole-h commented Jan 14, 2021

Don't worry about it, it happens (more frequently than you'd think). I removed the additional reviewers (though it doesn't really change much since they're still subscribed due to being requested as a reviewer). ofborg should remove the extraneous labels by itself in time.

@Mic92
Copy link
Member

Mic92 commented Jan 14, 2021

@cole-h @zhaofengli In future you can also just put / followed by rebase-staging into a comment to perform a rebase:

nixpkgs/.github/workflows/rebase-staging.yml

Line 7 in ff22087

# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications.

@github-actions
Copy link
Contributor

Failed to rebase on staging

@Mic92 Mic92 merged commit db65f1c into NixOS:staging Jan 14, 2021
@zhaofengli zhaofengli deleted the coreutils-getdents branch January 14, 2021 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
6.topic: golang 6.topic: nixos 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zhaofengli @cole-h @Mic92 @Janik-Haag