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.

Sign up for GitHub

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

WIP: treewide: Improve pure darwin cross #110914

Draft
wants to merge 2 commits into
base: staging
Choose a base branch
from
Draft

WIP: treewide: Improve pure darwin cross #110914

wants to merge 2 commits into from

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 27, 2021 •
edited
Loading

Motivation for this change

Some things are a little messier than they could be because I'm avoiding mass rebuilds. I'll go back and clean up after. Doing that right away.

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.

@Ericson2314 Ericson2314 requested a review from nbp as a code owner January 27, 2021 06:21
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package labels Jan 27, 2021
@ofborg ofborg bot requested review from copumpkin and gridaphobe January 27, 2021 06:31
@siraben
Copy link
Member

siraben commented Jan 27, 2021

What will this change enable?

@Ericson2314
Copy link
Member Author

See #97047

@Ericson2314 Ericson2314 mentioned this pull request Jan 27, 2021
Closed
@Ericson2314 Ericson2314 marked this pull request as draft January 28, 2021 01:21
@ofborg ofborg bot added the 6.topic: stdenv Standard environment label Jan 28, 2021
@Ericson2314
Copy link
Member Author

@matthewbauer OK I got as far as building libsystem. Do you know how the compiler-rt, libc++, and libc++abi part works? libc++abi seems to want libc++ to to already be buildable or something.

(To be fare, it works fine-ish to just reuse the same libsystem and just do cross for everything else, but I want to at least try doing everything "right" before giving up.)

@thefloweringash thefloweringash mentioned this pull request Feb 5, 2021
Merged
21 tasks
@Ericson2314 Ericson2314 force-pushed the fix-darwin-static branch from 557bce0 to f9298dd Compare May 1, 2021 19:01
@github-actions github-actions bot added 6.topic: bsd Running or building packages on BSD 6.topic: emacs Text editor 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: systemd 6.topic: vim labels May 1, 2021
@github-actions github-actions bot removed 6.topic: rust 6.topic: bsd Running or building packages on BSD 6.topic: python labels May 2, 2021
@Ericson2314 Ericson2314 force-pushed the fix-darwin-static branch from 1edcf5f to 9ba3632 Compare May 4, 2021 05:35
@github-actions github-actions bot added the 6.topic: bsd Running or building packages on BSD label May 4, 2021
@Ericson2314 Ericson2314 mentioned this pull request May 4, 2021
Merged
10 tasks
Ericson2314 added a commit to Ericson2314/nixpkgs that referenced this pull request May 6, 2021
@Ericson2314
treewide: Do a number of no-op cleanups for cross and darwin
470640e 
I am taking the non-invasive parts of NixOS#110914 to hopefully help out with NixOS#111988.

In particular:

 - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
   a proper `callPackage`.

 - Adjust Darwin `stdenv`'s overlays keeping things from the previous
   stage to not stick around too much.

 - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
   closer to a unified LLVM and GCC bootstrap.
Ericson2314 added 2 commits May 6, 2021 15:57
@Ericson2314
darwin packages: Get ready for cross
f529df0 
If things build fine with `stdenvNoCC`, let them use that. If tools
might be prefixed, prepare for that.
@Ericson2314
treewide: Try to put together darwin cross bootsttrapping
08d1131
@Ericson2314 Ericson2314 force-pushed the fix-darwin-static branch from 9ba3632 to 08d1131 Compare May 6, 2021 19:58
@github-actions github-actions bot removed the 6.topic: bsd Running or building packages on BSD label May 6, 2021
@stale
Copy link

stale bot commented Nov 9, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 9, 2021
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@nbp nbp Awaiting requested review from nbp

@copumpkin copumpkin Awaiting requested review from copumpkin

@gridaphobe gridaphobe Awaiting requested review from gridaphobe

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: darwin Running or building packages on Darwin 6.topic: stdenv Standard environment 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Ericson2314 @siraben @wegank