Skip to content

coreutils: switch to version 9 for darwin#143800

Merged
happysalada merged 1 commit intoNixOS:staging-nextfrom
happysalada:staging-next
Oct 31, 2021
Merged

coreutils: switch to version 9 for darwin#143800
happysalada merged 1 commit intoNixOS:staging-nextfrom
happysalada:staging-next

Conversation

@happysalada
Copy link
Contributor

@happysalada happysalada commented Oct 30, 2021

Motivation for this change

switch darwin to version 9 of coreutils.
Currently testing this.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 30, 2021
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Oct 30, 2021
@ofborg ofborg bot requested review from edolstra, lovek323 and np October 30, 2021 05:25
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Oct 30, 2021
@happysalada
Copy link
Contributor Author

@dasJ might be interested. When I tested your original PR it was including this, but somehow this was reverted later. This PR is just to bring it back.
@r-burns thank you for bringing my attention to this, I had completely missed it.

@happysalada
Copy link
Contributor Author

Ok just finished testing on darwin-x86_64. Leaving this for one more day open, just in case people want to give feedback.

@mohe2015
Copy link
Contributor

mohe2015 commented Oct 30, 2021

I thought we wanted to do this in the next cycle as the Darwin workers on hydra are broken/unstable again. (https://matrix.to/#/!UNVBThoJtlIiVwiDjU:nixos.org/$LB3d9bKrXy-aove7ifYFaJPhqT4vEBro15VNlGeEEY8?via=matrix.org&via=helsinki-systems.de&via=nixos.org)


# coreutils 9 messes up some binary format on darwin
# https://github.com/NixOS/nixpkgs/pull/141684
# test by trying to build alacritty for example
Copy link
Contributor

Choose a reason for hiding this comment

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

Anyone happen to have an example which doesn't have quite as massive dependency/rebuild footprint for testing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

r-burns was saying jx was the fastest one for him.
My machine is quite old, it still took me 6 hours I think.
If you leave it overnight, it should be fine.
I made sure by also testing alacritty.

Copy link
Contributor

@r-burns r-burns Oct 30, 2021

Choose a reason for hiding this comment

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

No, my jx testing was all on linux. I didn't encounter any issues on darwin (that goes for alacritty as well).

@happysalada
Copy link
Contributor Author

@mohe2015 I'm happy to do it in the next cycle. it would be a shame to miss the update I felt.
I'm happy to go with what people feel is best.

@mohe2015
Copy link
Contributor

Others please also comment.

I'm not a good hydra reader but it seems like only one x86 Darwin builder is working and two are hanging so I assume the reasoning is still valid.

I don't know though how long it would take or so.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Oct 30, 2021

Was the original issue why this was reverted fixed? If so how? I didn't find any information about that in this PR.

@r-burns
Copy link
Contributor

r-burns commented Oct 30, 2021

As far as I'm aware, @happysalada was the only one to reproduce the darwin errors locally, so if those are fixed then this is good to go IMO. But if we want to wait until the next staging cycle, that's fine by me.

@happysalada
Copy link
Contributor Author

@SuperSandro2000 the original issue was that the resulting rust binaries had the wrong binary format and couldn't be executed. With the coreutils fix, this doesn't happen anymore (this is what was tested in this PR).

@SuperSandro2000
Copy link
Member

You mean with 924ccbf#diff-88e1a963530d2a05ed02f38aa91b0a292d425396118e1d1a7b05e9132d4f7f5e? Or which fix exactly?

@happysalada
Copy link
Contributor Author

@SuperSandro2000 yes, that fix.

@happysalada
Copy link
Contributor Author

I'm going to say let's merge this one, the build queue is almost empty, and it removes weird logic that is unecessary.

@happysalada happysalada merged commit 441a141 into NixOS:staging-next Oct 31, 2021
@happysalada happysalada deleted the staging-next branch October 31, 2021 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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.

5 participants