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

stdenvBootstrapTools: use cctools-port #243527

Closed
wants to merge 1 commit into from

Conversation

reckenrode
Copy link
Contributor

Description of changes

This fixes the Hydra build failure on staging-next. #241951 (comment)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.05 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.

This fixes the Hydra build failure on staging-next. NixOS#241951 (comment)
@tjni
Copy link
Contributor

tjni commented Jul 14, 2023

I have a PR in #243440 addressing this problem in a different way. I don't have a strong opinion on which one we take. Which one do you prefer?

@reckenrode
Copy link
Contributor Author

I have a PR in #243440 addressing this problem in a different way. I don't have a strong opinion on which one we take. Which one do you prefer?

I don’t feel strongly either way. If your change (presumably using isMachO to test?) produces a working bootstrap tools, it’s probably more forward-looking than continuing to use cctools-port. On the other hand, the stdenv bootstrap starts from cctools-port and builds from there.

@tjni
Copy link
Contributor

tjni commented Jul 14, 2023

I admit I don't know exactly what that bootstrap tools job is testing, but indeed restricting strip and install_name_tool to running only on files that pass isMachO fixes the test locally for me.

@vcunat vcunat changed the base branch from staging-next to master July 15, 2023 17:53
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jul 15, 2023
@reckenrode
Copy link
Contributor Author

Closing this since #243440 was merged.

@reckenrode reckenrode closed this Jul 19, 2023
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.

2 participants