Skip to content

trivial-builders: Deduplicate docs#294944

Merged
infinisil merged 1 commit intoNixOS:masterfrom
hercules-ci:docs-dedup-trivial-builders
Mar 12, 2024
Merged

trivial-builders: Deduplicate docs#294944
infinisil merged 1 commit intoNixOS:masterfrom
hercules-ci:docs-dedup-trivial-builders

Conversation

@roberth
Copy link
Member

@roberth roberth commented Mar 11, 2024

Description of changes

Clean up duplicated docs and stop any confusion around where to write them.

I didn't have the opportunity to do all work at once, so I've added TODOs to bring attention to the situation.

Things done

  • Built on platform(s)
    • x86_64-linux
      • and viewed the changes
    • 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.

I didn't have the opportunity to do all work at once, so I've added
TODOs to bring attention to the situation.
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Mar 11, 2024
@roberth roberth requested a review from infinisil March 11, 2024 10:53
@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 Mar 11, 2024
Comment on lines +626 to 628
# Docs in doc/build-helpers/trivial-build-helpers.chapter.md
# See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-writeReferencesToFile
writeReferencesToFile = path: runCommand "runtime-deps"
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this going to reflect on NixOS/nix#9054?

Copy link
Member Author

Choose a reason for hiding this comment

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

They can be moved back, and something like nixdoc can be added.
For now what matters is that there's no more duplication and contributors know where to add their docs when they change/add things.

@infinisil infinisil merged commit 1d14cc5 into NixOS:master Mar 12, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2024-03-21-documentation-team-meeting-notes-114/41957/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: documentation This PR adds or changes documentation 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