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 153594 doc optimization #156992

Merged
merged 5 commits into from
Jan 27, 2022

Conversation

roberth
Copy link
Member

@roberth roberth commented Jan 27, 2022

Motivation for this change

Fix installer test, which invokes the documentation differently when built inside or outside the VM.

This optimization probably isn't worth it. Long term solution: NixOS/nix#5973 (comment)

Reverts #153594

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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@roberth roberth marked this pull request as draft January 27, 2022 12:14
@roberth
Copy link
Member Author

roberth commented Jan 27, 2022

nix-build -A nixosTests.installer.simple still fails.
I'm confused.

NB: don't translate that command to a nix-command invocation or whatever; could make a wrong difference. Should be plain old nix-build in a git clone.

@roberth roberth marked this pull request as ready for review January 27, 2022 14:44
@roberth
Copy link
Member Author

roberth commented Jan 27, 2022

Well, at least this removes some fragility. Merging.

@roberth roberth merged commit d0947df into NixOS:master Jan 27, 2022
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.

1 participant