Skip to content

Commit 4f59aa5

Browse files
authored
treewide: fix typos (#384093)
2 parents 648a374 + d525eb5 commit 4f59aa5

File tree

16 files changed

+24
-24
lines changed

16 files changed

+24
-24
lines changed

doc/build-helpers/fixed-point-arguments.chapter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Build helpers don't always support fixed-point arguments yet, as support in [`st
99

1010
Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
1111

12-
Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point argumnts from passing down the base build helper (specified as `constructDrv`).
12+
Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`).
1313

1414
:::{.example #ex-build-helpers-extendMkDerivation}
1515

doc/languages-frameworks/go.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ In case a project doesn't have external dependencies or dependencies are vendore
304304
- Run `go mod init <module name>` in `postPatch`
305305

306306
In case the package has external dependencies that aren't vendored or the build setup is more complex the upstream source might need to be patched.
307-
Examples for the migration can be found in the [issue tracking migration withing nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).
307+
Examples for the migration can be found in the [issue tracking migration within nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).

doc/languages-frameworks/neovim.section.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ See the next section for more details.
1111

1212
## Custom configuration {#neovim-custom-configuration}
1313

14-
There are two wrappers available to provide additionnal configuration around the vanilla package `pkgs.neovim-unwrapped`:
14+
There are two wrappers available to provide additional configuration around the vanilla package `pkgs.neovim-unwrapped`:
1515
1. `wrapNeovim`: the historical one you should use
1616
2. `wrapNeovimUnstable` intended to replace the former. It has more features but
1717
the interface is not stable yet.
@@ -112,7 +112,7 @@ upload their package to [](www.luarocks.org). This means less work for nixpkgs m
112112
This means several neovim plugins are first packaged as nixpkgs [lua
113113
packages](#packaging-a-library-on-luarocks), and converted via `buildNeovimPlugin` in
114114
a vim plugin. This conversion is necessary because neovim expects lua folders to be
115-
top-level while luarocks installs them in varous subfolders by default.
115+
top-level while luarocks installs them in various subfolders by default.
116116

117117
For instance:
118118
```nix

doc/release-notes/rl-2505.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
- Structure of the `functor` of some types has changed. `functor` is an implementation detail and should not be relied upon. If you did rely on it let us know in this [PR](https://github.com/NixOS/nixpkgs/pull/363565).
4646
- [`lib.types.enum`](https://nixos.org/manual/nixos/unstable/#sec-option-types-basic): Previously the `functor.payload` was the list of enum values directly. Now it is an attribute set containing the values in the `values` attribute.
47-
- [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the seperator directly. Now it is an attribute set containing the seperator in the `sep` attribute.
47+
- [`lib.types.separatedString`](https://nixos.org/manual/nixos/unstable/#sec-option-types-string): Previously the `functor.payload` was the separator directly. Now it is an attribute set containing the separator in the `sep` attribute.
4848

4949
- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus,
5050
`tinycc.out` may now only provide the tcc and cross compilers binaries.

nixos/doc/manual/development/settings-options.section.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ have a predefined type and string generator already declared under
191191
in {
192192
a = 1;
193193
b = format.lib.mkSubstitution "a";
194-
c = format.lib.mkSubstition "SOME_ENVVAR";
195-
d = format.lib.mkSubstition {
194+
c = format.lib.mkSubstitution "SOME_ENVVAR";
195+
d = format.lib.mkSubstitution {
196196
value = "SOME_OPTIONAL_ENVVAR";
197197
optional = true;
198198
};
@@ -333,7 +333,7 @@ have a predefined type and string generator already declared under
333333
`{ sections = {}; globalSection = {}; }` where *sections* are several
334334
sections as with *pkgs.formats.ini* and *globalSection* being just a single
335335
attrset of key-value pairs for a single section, the global section which
336-
preceedes the section definitions.
336+
precedes the section definitions.
337337

338338
The attribute `lib.type.atom` contains the used INI atom.
339339

nixos/doc/manual/release-notes/rl-2111.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ In addition to numerous new and upgraded packages, this release has the followin
409409
configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst).
410410

411411
- `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality.
412-
- `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison.
412+
- `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland session.
413413

414414
- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters.
415415

nixos/doc/manual/release-notes/rl-2311.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
472472
- `pharo` has been updated to latest stable v10.0.8, which is compatible with
473473
the latest stable and oldstable images (Pharo 10 and 11). The VM in question
474474
is the 64bit Spur. The 32bit version has been dropped due to lack of
475-
maintenance. The Cog VM has been deleted because it is severily outdated.
475+
maintenance. The Cog VM has been deleted because it is severely outdated.
476476
Finally, the `pharo-launcher` package has been deleted because it was not
477477
compatible with the newer VM, and due to lack of maintenance.
478478

nixos/doc/manual/release-notes/rl-2405.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
173173

174174
- [ryzen-monitor-ng](https://github.com/mann1x/ryzen_monitor_ng), a desktop AMD CPU power monitor and controller, similar to Ryzen Master but for Linux. Available as [programs.ryzen-monitor-ng](#opt-programs.ryzen-monitor-ng.enable).
175175

176-
- [ryzen-smu](https://gitlab.com/leogx9r/ryzen_smu), Linux kernel driver to expose the SMU (System Management Unit) for certain AMD Ryzen Processors. Includes the userspace program `monitor_cpu`. Available at [hardward.cpu.amd.ryzen-smu](#opt-hardware.cpu.amd.ryzen-smu.enable).
176+
- [ryzen-smu](https://gitlab.com/leogx9r/ryzen_smu), Linux kernel driver to expose the SMU (System Management Unit) for certain AMD Ryzen Processors. Includes the userspace program `monitor_cpu`. Available at [hardware.cpu.amd.ryzen-smu](#opt-hardware.cpu.amd.ryzen-smu.enable).
177177

178178
- [Scrutiny](https://github.com/AnalogJ/scrutiny), a S.M.A.R.T monitoring tool for hard disks with a web frontend. Available as [services.scrutiny](#opt-services.scrutiny.enable).
179179

nixos/doc/manual/release-notes/rl-2505.section.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303

304304
- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.
305305

306-
- `services.bird2` has been renamed to `services.bird` and the default bird package has been switched to `bird3`. `bird2` can still be choosen via the `services.bird.package` option.
306+
- `services.bird2` has been renamed to `services.bird` and the default bird package has been switched to `bird3`. `bird2` can still be chosen via the `services.bird.package` option.
307307

308308
- `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
309309
Like upstream's docker images, renovate now runs on NodeJS 22.
@@ -389,9 +389,9 @@
389389

390390
- `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024.
391391

392-
- `matomo-beta` has been removed as the version of the `matomo` package can now be easily overriden through `overrideAttrs` (see [PR #374022](https://github.com/NixOS/nixpkgs/pull/374022))
392+
- `matomo-beta` has been removed as the version of the `matomo` package can now be easily overridden through `overrideAttrs` (see [PR #374022](https://github.com/NixOS/nixpkgs/pull/374022))
393393

394-
- `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
394+
- `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024.
395395

396396
- `containerd` has been updated to v2, which contains breaking changes. See the [containerd
397397
2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
@@ -447,7 +447,7 @@
447447
- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
448448
`zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable.
449449

450-
- `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.
450+
- `programs.clash-verge.tunMode` was deprecated and removed because now service mode is necessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.
451451

452452
- `siduck76-st` has been renamed to `st-snazzy`, like the project's [flake](https://github.com/siduck/st/blob/main/flake.nix).
453453

nixos/modules/services/databases/postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ PostgreSQL's versioning policy is described [here](https://www.postgresql.org/su
256256
- After that a version is considered end-of-life (EOL).
257257
- Around February each year is the first time an EOL-release will not have received regular updates anymore.
258258
259-
Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in Februrary of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693).
259+
Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in February of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693).
260260
261261
Thus:
262262
- In September/October the new major version will be released and added to nixos-unstable.
@@ -374,7 +374,7 @@ several common hardening options from `systemd`, most notably:
374374
* A system call filter (see {manpage}`systemd.exec(5)` for details on `@system-service`).
375375
* A stricter default UMask (`0027`).
376376
* Only sockets of type `AF_INET`/`AF_INET6`/`AF_NETLINK`/`AF_UNIX` allowed.
377-
* Restricted filesystem access (private `/tmp`, most of the file-system hierachy is mounted read-only, only process directories in `/proc` that are owned by the same user).
377+
* Restricted filesystem access (private `/tmp`, most of the file-system hierarchy is mounted read-only, only process directories in `/proc` that are owned by the same user).
378378
* When using [`TABLESPACE`](https://www.postgresql.org/docs/current/manage-ag-tablespaces.html)s, make sure to add the filesystem paths to `ReadWritePaths` like this:
379379
```nix
380380
{

0 commit comments

Comments
 (0)