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

pkgs/stdenv/darwin: move bootstrap files definitions to bootstrap-fil… #284628

Merged
merged 1 commit into from
Jan 30, 2024

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Jan 28, 2024

…es/ directory

The change moves definition of bootstrap files slightly closer to linux structure to eventually allow those to update in bulk: #253713

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

Add a 👍 reaction to pull requests you find important.

…es/ directory

The change moves definition of bootstrap files slightly closer to
`linux` structure to eventually allow those to update in bulk:
NixOS#253713
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jan 28, 2024
@trofi
Copy link
Contributor Author

trofi commented Jan 28, 2024

On linux host tested the following, it's a no-op:

$ nix build -f. hello --argstr system x86_64-darwin; nix build -f. hello --argstr system aarch64-darwin;

My mild worry is on inherit (localSystem) system;. I think it's removal should be a no-op on darwin as well. But mentioning it just in case.

Copy link
Contributor

@reckenrode reckenrode left a comment

Choose a reason for hiding this comment

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

nix-instantiate . -A stdenv returns the same paths for aarch64- and x86_64-darwin before and after cherry-picking this PR onto master. More alignment with Linux is usually a good thing. LGTM

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 28, 2024
@lovesegfault
Copy link
Member

@ofborg eval

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 28, 2024
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 28, 2024
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

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

I think <nix/fetchurl.nix> refers to this fetchurl.nix? And that indicates the system argument as obsolete, so it's probably safe to drop.

LGTM

@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Jan 29, 2024
@lovesegfault lovesegfault merged commit 3f5fab2 into NixOS:master Jan 30, 2024
25 checks passed
@trofi trofi deleted the darwin-more-homogenous-bootstrap branch January 30, 2024 09:51
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 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants