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

enable aarch64-darwin in release.nix #4867

Merged
merged 1 commit into from
Jun 7, 2021

Conversation

kloenk
Copy link
Member

@kloenk kloenk commented Jun 1, 2021

This enables aarch64-darwin builds, on top of nixpkgs-21.05-small (NixOS/nixpkgs#105026)

@kloenk
Copy link
Member Author

kloenk commented Jun 1, 2021

I tested to build hello in nix repl on my m1 MBP. Hello was produced as aarch64-darwin binary, so it's working

@edolstra
Copy link
Member

edolstra commented Jun 1, 2021

I don't know if this will work, given that the 2.3 branch is built against Nixpkgs 20.03: https://hydra.nixos.org/jobset/nix/maintenance-2.3#tabs-configuration

@domenkozar
Copy link
Member

Could we bump that to 21.05?

@kloenk
Copy link
Member Author

kloenk commented Jun 1, 2021

I don't know if this will work, given that the 2.3 branch is built against Nixpkgs 20.03: https://hydra.nixos.org/jobset/nix/maintenance-2.3#tabs-configuration

It would not work. So we would have to bump that to 21.05. Or back port aarch64-darwin support, but I don't think that is a good idea.

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/nix-macos-monthly/12330/6

@jonringer
Copy link
Contributor

jonringer commented Jun 3, 2021

nix-2.3.12 can built against 21.05. It was needed for nixos-homepage

@domenkozar
Copy link
Member

Note that this is the last step needed to get out-of-the-box Apple Silicon support in Nix.

@kloenk could you rebase?

@kloenk
Copy link
Member Author

kloenk commented Jun 3, 2021

Will rebase tomorrow

@kloenk
Copy link
Member Author

kloenk commented Jun 4, 2021

nix rebased, now building the rebased nix. Will report if it works as edit to this comment.

EDIT: works well on my machine (unstable daemon).

@domenkozar
Copy link
Member

@edolstra shall we give it a go and see what hydra says?

@domenkozar
Copy link
Member

@kloenk you also need to add aarch64-darwin to line 318.

@kloenk
Copy link
Member Author

kloenk commented Jun 7, 2021

@domenkozar:
Thanks, fixed

@domenkozar
Copy link
Member

@edolstra any objections to merge this and see if it works?

@edolstra
Copy link
Member

edolstra commented Jun 7, 2021

Yes, we can try. Though ideally we shouldn't change the Nixpkgs branch for a stable Nix release, since it could cause incompatible changes in the Nix binary tarballs that we provide (e.g. a Glibc upgrade causing NSS problems).

@domenkozar
Copy link
Member

I wonder if we could test how old glibc it supports?

@domenkozar domenkozar merged commit b98a50a into NixOS:2.3-maintenance Jun 7, 2021
@domenkozar
Copy link
Member

@kloenk there's an evaluation error for installerScript: https://hydra.nixos.org/eval/1676684#tabs-errors

@jonringer
Copy link
Contributor

Will probably have to make the fixes in nixpkgs, then update the reference to nixpkgs which is able to evalutate for the new platforms, I had to do something similar for fixing staging-next tarball.
NixOS/nixpkgs#125842
NixOS/nixpkgs#125993

@domenkozar
Copy link
Member

Ah, the channel is hardcoded in Hydra and I don't have permissions for nix project.

@edolstra could you set 21.05 channel at https://hydra.nixos.org/jobset/nix/maintenance-2.3#tabs-configuration

@edolstra
Copy link
Member

edolstra commented Jun 9, 2021

Done.

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

Successfully merging this pull request may close these issues.

5 participants