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: Apply sys_getdents patch unconditionally #109331

Merged
merged 1 commit into from Jan 14, 2021

Conversation

@zhaofengli
Copy link

@zhaofengli zhaofengli commented Jan 14, 2021

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.
@cole-h
Copy link
Member

@cole-h 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.

Also breaks build for riscv64.
@zhaofengli zhaofengli force-pushed the zhaofengli:coreutils-getdents branch from 5e04356 to 091a4ef Jan 14, 2021
@zhaofengli zhaofengli changed the base branch from master to staging Jan 14, 2021
@zhaofengli
Copy link
Author

@zhaofengli zhaofengli commented Jan 14, 2021

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

@cole-h
Copy link
Member

@cole-h 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
Contributor

@Mic92 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:

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

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jan 14, 2021

@Mic92 Mic92 merged commit db65f1c into NixOS:staging Jan 14, 2021
18 checks passed
18 checks passed
tests
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
coreutils, coreutils.passthru.tests on aarch64-linux Success
Details
coreutils, coreutils.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="091a4ef"; rev="091a4ef01e5f5d8e6d4f32e19f6212a4423eb5a2"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@zhaofengli zhaofengli deleted the zhaofengli:coreutils-getdents branch Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.