Unverified Commit 4f59aa5e authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

treewide: fix typos (#384093)

parents 648a374b d525eb58
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Build helpers don't always support fixed-point arguments yet, as support in [`st

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).

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`).
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`).

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

+1 −1
Original line number Diff line number Diff line
@@ -304,4 +304,4 @@ In case a project doesn't have external dependencies or dependencies are vendore
- Run `go mod init <module name>` in `postPatch`

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.
Examples for the migration can be found in the [issue tracking migration withing nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).
Examples for the migration can be found in the [issue tracking migration within nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).
+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ See the next section for more details.

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

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

For instance:
```nix
+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@

- 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).
  - [`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.
  - [`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.
  - [`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.

- The `tinycc` package now has the `dev`, `doc` and `lib` outputs, thus,
`tinycc.out` may now only provide the tcc and cross compilers binaries.
+3 −3
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ have a predefined type and string generator already declared under
          in {
            a = 1;
            b = format.lib.mkSubstitution "a";
            c = format.lib.mkSubstition "SOME_ENVVAR";
            d = format.lib.mkSubstition {
            c = format.lib.mkSubstitution "SOME_ENVVAR";
            d = format.lib.mkSubstitution {
              value = "SOME_OPTIONAL_ENVVAR";
              optional = true;
            };
@@ -333,7 +333,7 @@ have a predefined type and string generator already declared under
    `{ sections = {}; globalSection = {}; }` where *sections* are several
    sections as with *pkgs.formats.ini* and *globalSection* being just a single
    attrset of key-value pairs for a single section, the global section which
    preceedes the section definitions.
    precedes the section definitions.

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

Loading