Skip to content

Comments

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

Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom
Ericson2314:darwin-cross-prep
May 6, 2021
Merged

treewide: Do a number of no-op cleanups for cross and darwin#121654
Ericson2314 merged 1 commit intoNixOS:masterfrom
Ericson2314:darwin-cross-prep

Conversation

@Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented May 4, 2021 •
edited
Loading

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
Ericson2314
Ericson2314 commented May 4, 2021
View reviewed changes
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 4, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented May 4, 2021 •
edited
Loading

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

@Ericson2314 Ericson2314 force-pushed the darwin-cross-prep branch from 4fcbfa9 to 8d96357 Compare May 5, 2021 02:51
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label May 5, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels May 5, 2021
thefloweringash
thefloweringash approved these changes May 6, 2021
View reviewed changes
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.

@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 Ericson2314 force-pushed the darwin-cross-prep branch from 8d96357 to 470640e Compare May 6, 2021 15:17
@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

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@edolstra edolstra Awaiting requested review from edolstra

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil

@nbp nbp Awaiting requested review from nbp

1 more reviewer

@thefloweringash thefloweringash thefloweringash approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Ericson2314 @r-rmcgibbo @thefloweringash @sternenseemann