f124c73686
Per RFC 9110, [section 8.8.1][1], different representations of the same resource should have different Etags: > A strong validator is unique across all versions of all > representations associated with a particular resource over time. > However, there is no implication of uniqueness across representations > of different resources (i.e., the same strong validator might be in > use for representations of multiple resources at the same time and > does not imply that those representations are equivalent) When serving statically compressed files (ie, when there is an existing corresponding .gz/.br/etc. file on disk), Nginx sends the Etag marked as strong. These tags should be different for each compressed format (as shown in an explicit example in section [8.8.3.3][2] of the RFC). Upstream Etags are composed of the file modification timestamp and content length, and the latter generally changes between these representations. Previous implementation of Nix-specific Etags for things served from store used the store hash. This is fine to share between different files, but it becomes a problem for statically compressed versions of the same file, as it means Nginx was serving different representations of the same resource with the same Etag, marked as strong. This patch addresses this by imitating the upstream Nginx behavior, and appending the value of content length to the store hash. [1]: https://www.rfc-editor.org/rfc/rfc9110.html#name-validator-fields [2]: https://www.rfc-editor.org/rfc/rfc9110.html#name-example-entity-tags-varying |
||
---|---|---|
.. | ||
build-helpers | ||
contributing | ||
development | ||
doc-support | ||
functions | ||
hooks | ||
languages-frameworks | ||
module-system | ||
old | ||
packages | ||
stdenv | ||
tests | ||
using | ||
build-helpers.md | ||
common.nix | ||
contributing.md | ||
default.nix | ||
development.md | ||
functions.md | ||
lib.md | ||
manpage-urls.json | ||
manual.md.in | ||
overrides.css | ||
preface.chapter.md | ||
README.md | ||
shell.nix | ||
stdenv.md | ||
style.css | ||
using-nixpkgs.md |
Contributing to the Nixpkgs reference manual
This directory houses the sources files for the Nixpkgs reference manual.
Going forward, it should only contain reference documentation. For tutorials, guides and explanations, contribute to https://nix.dev/ instead.
For documentation only relevant for contributors, use Markdown files and code comments in the source code.
Rendered documentation:
The rendering tool is nixos-render-docs, sometimes abbreviated nrd
.
Contributing to this documentation
You can quickly check your edits with nix-build
:
$ cd /path/to/nixpkgs
$ nix-build doc
If the build succeeds, the manual will be in ./result/share/doc/nixpkgs/manual.html
.
devmode
The shell in the manual source directory makes available a command, devmode
.
It is a daemon, that:
- watches the manual's source for changes and when they occur — rebuilds
- HTTP serves the manual, injecting a script that triggers reload on changes
- opens the manual in the default browser
Syntax
As per RFC 0072, all new documentation content should be written in CommonMark Markdown dialect.
Additional syntax extensions are available, all of which can be used in NixOS option documentation. The following extensions are currently used:
Tables
Tables, using the GitHub-flavored Markdown syntax.
Anchors
Explicitly defined anchors on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between automatically assigned identifiers.
It uses the widely compatible header attributes syntax:
## Syntax {#sec-contributing-markup}
Note
NixOS option documentation does not support headings in general.
Inline Anchors
Allow linking arbitrary place in the text (e.g. individual list items, sentences…).
They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called bracketed spans:
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGAppsHook` will prepend it to `XDG_DATA_DIRS`.
Automatic links
If you omit a link text for a link pointing to a section, the text will be substituted automatically. For example [](#chap-contributing)
.
This syntax is taken from MyST.
Roles
If you want to link to a man page, you can use {manpage}`nix.conf(5)`
. The references will turn into links when a mapping exists in doc/manpage-urls.json
.
A few markups for other kinds of literals are also available:
{command}`rm -rfi`
{env}`XDG_DATA_DIRS`
{file}`/etc/passwd`
{option}`networking.useDHCP`
{var}`/etc/passwd`
These literal kinds are used mostly in NixOS option documentation.
This syntax is taken from MyST. Though, the feature originates from reStructuredText with slightly different syntax.
Admonitions
Set off from the text to bring attention to something.
It uses pandoc’s fenced div
s syntax:
::: {.warning}
This is a warning
:::
The following are supported:
Definition lists
For defining a group of terms:
pear
: green or yellow bulbous fruit
watermelon
: green fruit with red flesh
Commit conventions
-
Make sure you read about the commit conventions common to Nixpkgs as a whole.
-
If creating a commit purely for documentation changes, format the commit message in the following way:
doc: (documentation summary) (Motivation for change, relevant links, additional information.)
Examples:
-
doc: update the kernel config documentation to use
nix-shell
-
doc: add information about
nix-update-script
Closes #216321.
-
-
If the commit contains more than just documentation changes, follow the commit message format relevant for the rest of the changes.