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

doc: migrate filesets to doc-comment format #303811

Merged
merged 2 commits into from
May 21, 2024

Conversation

hsjobeki
Copy link
Contributor

Description of changes

lib.filesets comments migrated to doc-comments.

Manual steps:

  • File description headings should start with h1 not h2. (consistency across doc-comments)
  • reformatted some of the arguments/structured args documentation manually. Since they would be lost with our current automatism.

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.

Copy link
Member

@DanielSidhion DanielSidhion left a comment

Choose a reason for hiding this comment

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

@hsjobeki I didn't make suggestions to fix the line indentation because I'm assuming you want to get these fixed in the tooling you're using for the conversion. The only suggestion I made is for a bit of extra content in the description of one of the functions, just because that function's description mentions two arguments, but only one is caught by the tooling.

lib/fileset/default.nix Outdated Show resolved Hide resolved
lib/fileset/default.nix Show resolved Hide resolved
lib/fileset/default.nix Outdated Show resolved Hide resolved
lib/fileset/default.nix Outdated Show resolved Hide resolved
lib/fileset/default.nix Outdated Show resolved Hide resolved
@hsjobeki
Copy link
Contributor Author

hsjobeki commented Apr 29, 2024

@DanielSidhion I'll add the indentation fixes to the tooling. Most of it was done manually anyways. I dont have tooling to automatically migrate structured arguments.
This is still an open question, so i did it by hand.

We must manually revise the file now. Migration cannot run twice. Maybe i should add a markdown formatter, but had bad experience in nixdoc with it. I'll think about the formatting issues.

@hsjobeki hsjobeki force-pushed the doc/comments-fileset branch 2 times, most recently from 1150cd5 to 2526593 Compare April 29, 2024 20:34
@hsjobeki
Copy link
Contributor Author

hsjobeki commented Apr 29, 2024

@DanielSidhion indentation should be fine now. (also needed to rebase)

Copy link
Member

@DanielSidhion DanielSidhion left a comment

Choose a reason for hiding this comment

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

Thanks for the changes! Also rendered the manual locally and checked that nothing was broken.

@DanielSidhion DanielSidhion merged commit 38cd8da into NixOS:master May 21, 2024
21 checks passed
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