diff options
| author | Naïm Favier <n@monade.li> | 2023-01-01 14:15:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-01 14:15:05 +0100 |
| commit | 8796411139fd503a8c803490309be8184388014c (patch) | |
| tree | fd7a3cf1993950cd61694afcf5e0582c2bee9fa3 /doc | |
| parent | 1596c87bdb2ad55ca816e96441df8deae4a6c0f4 (diff) | |
| parent | 22ea90a4d87b33101a72c2eff633472fb2e59171 (diff) | |
Merge pull request #208176 from ncfavier/markdown-no-trailing
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/builders/images/makediskimage.section.md | 2 | ||||
| -rw-r--r-- | doc/builders/testers.chapter.md | 2 | ||||
| -rw-r--r-- | doc/languages-frameworks/go.section.md | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/builders/images/makediskimage.section.md b/doc/builders/images/makediskimage.section.md index 9798a0be4d46b..833a6461e57bb 100644 --- a/doc/builders/images/makediskimage.section.md +++ b/doc/builders/images/makediskimage.section.md @@ -20,7 +20,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto ### Common - arbitrary NixOS configuration -- automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space +- automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space - multiple partition table layouts: EFI, legacy, legacy + GPT, hybrid, none through `partitionTableType` parameter - OVMF or EFI firmwares and variables templates can be customized - root filesystem `fsType` can be customized to whatever `mkfs.${fsType}` exist during operations diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index 342887da566c6..3d91f096051ee 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -62,7 +62,7 @@ runCommand "example" { ''; ``` -While `testBuildFailure` is designed to keep changes to the original builder's +While `testBuildFailure` is designed to keep changes to the original builder's environment to a minimum, some small changes are inevitable. - The file `$TMPDIR/testBuildFailure.log` is present. It should not be deleted. diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 523f5b26ec7f4..cefdd68c35208 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -16,7 +16,8 @@ In the following is an example expression using `buildGoModule`, the following a `vendorHash` can also be set to `null`. In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used. - To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` + To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` + To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums. |