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

treewide: Do a number of no-op cleanups for cross and darwin #121654

Merged
merged 1 commit into from
May 6, 2021

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented May 4, 2021

Motivation for this change

I am taking the non-invasive parts of #110914 to hopefully help out with #105026.

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.

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 added the 6.topic: darwin Running or building packages on Darwin label May 4, 2021
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label May 4, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented May 4, 2021

Result of nixpkgs-review pr 121654 at 4fcbfa94 run on x86_64-linux 1

1 package marked as broken and skipped:
  • darwin.binutilsNoLibc
4 packages built successfully:
  • binutilsNoLibc
  • darwin.ContactsPersistence
  • darwin.GameCenter
  • darwin.UIFoundation

Result of nixpkgs-review pr 121654 at 4fcbfa94 run on aarch64-linux 1

1 package built successfully:
  • binutilsNoLibc

Copy link
Member

@thefloweringash thefloweringash left a comment

Choose a reason for hiding this comment

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

LGTM.

pkgs/top-level/darwin-packages.nix Outdated Show resolved Hide resolved
pkgs/top-level/darwin-packages.nix Outdated Show resolved Hide resolved
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 Ericson2314 merged commit 8e84caf into NixOS:master May 6, 2021
@Ericson2314 Ericson2314 deleted the darwin-cross-prep branch May 6, 2021 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants