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

Revert "Merge pull request #253760 from chivay/bootstrap-scrt" #254073

Merged
merged 1 commit into from
Sep 8, 2023

Conversation

lovesegfault
Copy link
Member

Description of changes

This reverts commit ab66640 (#253760), reversing
changes made to c08b005.

The changes were merged without the associated bootstrap updates, and breaking
with the process for bootstrap changes.

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 reverts commit ab66640, reversing
changes made to c08b005.

The changes were merged without the associated bootstrap updates.
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Sep 8, 2023
@lovesegfault lovesegfault merged commit 6d3d30a into NixOS:master Sep 8, 2023
4 checks passed
@lovesegfault lovesegfault deleted the revert-bootstrap branch September 8, 2023 18:19
@trofi
Copy link
Contributor

trofi commented Sep 8, 2023

Is the process documented anywhere by chance?

I think we had quite a few updates recently to the bootstrap script that did not regenerate binaries. A few examples are:

These were just this year.

@lovesegfault lovesegfault restored the revert-bootstrap branch September 8, 2023 18:39
@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 Sep 8, 2023
@lovesegfault
Copy link
Member Author

It's not documented, it kind of existed when I picked up the function of uploading new bootstrap tarballs, and it's remained in a kind-of-exists way.

Documenting it would be good, but I have not had the time to work on Nix lately, other than uploading new tarballs since if I don't do it, no one will.

@amjoseph-nixpkgs should be able to help/explain the process well, since they've done it quite a few times.

I'm sorry about the state of all this, just trying to do the best with what little time I've got.

@trofi
Copy link
Contributor

trofi commented Sep 8, 2023

Sounds reasonable.

I someone gets to document the process it might be a good idea to change it as well as current process gets us suboptimal result: #253713

@Artturin
Copy link
Member

Artturin commented Sep 8, 2023

@lovesegfault in #180223 @amjoseph-nixpkgs also used files from hydra and cross-trunk to give you files to upload

Please advice how to proceed.

@asymmetric
Copy link
Contributor

I would be happy to help document this as part of the @NixOS/documentation-team efforts, together with someone who actually knows how it works.

@Artturin
Copy link
Member

Reverting the revert #256439

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants