···1121122. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`.
1131133. Create a branch for your change, e.g. `git checkout -b backport`.
1141144. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
115115-5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`.
115115+5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`.
1161166. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
117117118118## Criteria for Backporting changes
···185185##### Comments
186186```
187187188188-## Individual maintainer list {#reviewing-contributions-indvidual-maintainer-list}
188188+## Individual maintainer list {#reviewing-contributions-individual-maintainer-list}
189189190190When adding users to `maintainers/maintainer-list.nix`, the following
191191checks should be performed:
+1-1
doc/doc-support/lib-function-docs.nix
···11-# Generates the documentation for library functons via nixdoc. To add
11+# Generates the documentation for library functions via nixdoc. To add
22# another library function file to this list, the include list in the
33# file `doc/functions/library.xml` must also be updated.
44
+1-1
doc/languages-frameworks/beam.section.md
···9393- run `mix2nix > mix_deps.nix` in the upstream repo.
9494- pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease.
95959696-If there are git depencencies.
9696+If there are git dependencies.
97979898- You'll need to fix the version artificially in mix.exs and regenerate the mix.lock with fixed version (on upstream). This will enable you to run `mix2nix > mix_deps.nix`.
9999- From the mix_deps.nix file, remove the dependencies that had git versions and pass them as an override to the import function.
+1-1
doc/languages-frameworks/coq.section.md
···88* `customOCamlPackages` (optional, defaults to `null`, which lets Coq choose a version automatically), which can be set to any of the ocaml packages attribute of `ocaml-ng` (such as `ocaml-ng.ocamlPackages_4_10` which is the default for Coq 8.11 for example).
99* `coq-version` (optional, defaults to the short version e.g. "8.10"), is a version number of the form "x.y" that indicates which Coq's version build behavior to mimic when using a source which is not a release. E.g. `coq.override { version = "d370a9d1328a4e1cdb9d02ee032f605a9d94ec7a"; coq-version = "8.10"; }`.
10101111-The associated package set can be optained using `mkCoqPackages coq`, where `coq` is the derivation to use.
1111+The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use.
12121313## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages}
1414
+1-1
doc/languages-frameworks/cuda.section.md
···38383939Nixpkgs tries to target support real architecture defaults based on the
4040CUDA toolkit version with PTX support for future hardware. Experienced
4141-users may optmize this configuration for a variety of reasons such as
4141+users may optimize this configuration for a variety of reasons such as
4242reducing binary size and compile time, supporting legacy hardware, or
4343optimizing for specific hardware.
4444
+2-2
doc/languages-frameworks/cuelang.section.md
···3737```
38383939- The first parameter is the Cue schema file.
4040-- The second paramter is an options parameter, currently, only: `document` can be passed.
4040+- The second parameter is an options parameter, currently, only: `document` can be passed.
41414242-`document` : match your input data against this fragment of structure or definition, e.g. you may use the same schema file but differents documents based on the data you are validating.
4242+`document` : match your input data against this fragment of structure or definition, e.g. you may use the same schema file but different documents based on the data you are validating.
43434444Another example, given the following `validator.nix` :
4545```
+2-2
doc/languages-frameworks/hy.section.md
···4455### Installation without packages {#installation-without-packages}
6677-You can install `hy` via nix-env or by adding it to `configuration.nix` by reffering to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it succesfully works with `python3`.
77+You can install `hy` via nix-env or by adding it to `configuration.nix` by referring to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it successfully works with `python3`.
8899::: {.caution}
1010-Packages that are installed with your python derivation, are not accesible by `hy` this way.
1010+Packages that are installed with your python derivation, are not accessible by `hy` this way.
1111:::
12121313### Installation with packages {#installation-with-packages}
+1-1
doc/languages-frameworks/index.xml
···33 xml:id="chap-language-support">
44 <title>Languages and frameworks</title>
55 <para>
66- The <link linkend="chap-stdenv">standard build environment</link> makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of <literal>stdenv</literal>. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter.
66+ The <link linkend="chap-stdenv">standard build environment</link> makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accommodated by overriding the appropriate phases of <literal>stdenv</literal>. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter.
77 </para>
88 <xi:include href="agda.section.xml" />
99 <xi:include href="android.section.xml" />
+2-2
doc/languages-frameworks/python.section.md
···605605`test` command for a `checkPhase` which runs `pytest`. This is also beneficial
606606when a package may need many items disabled to run the test suite.
607607608608-Using the example above, the analagous `pytestCheckHook` usage would be:
608608+Using the example above, the analogous `pytestCheckHook` usage would be:
609609610610```
611611 checkInputs = [ pytestCheckHook ];
···624624 ];
625625```
626626627627-This is expecially useful when tests need to be conditionally disabled,
627627+This is especially useful when tests need to be conditionally disabled,
628628for example:
629629630630```
+1-1
doc/languages-frameworks/rust.section.md
···319319However, please check if it's possible to disable a problematic subset of the
320320test suite and leave a comment explaining your reasoning.
321321322322-This can be achived with `--skip` in `checkFlags`:
322322+This can be achieved with `--skip` in `checkFlags`:
323323324324```nix
325325rustPlatform.buildRustPackage {
+1-1
doc/old/cross.txt
···303303This is used by the Nix build process to set the dynamic linker, glibc
304304in the case of i686-linux using the default Nix packages collection.
305305306306-Obiously, since we need to compile libstc++ for arm-linux with uClibc linking
306306+Obviously, since we need to compile libstc++ for arm-linux with uClibc linking
307307will not be done correctly: you can't link object files built for arm-linux
308308with a glibc built for i686-linux.
309309
+1-1
doc/stdenv/multiple-output.chapter.md
···2929`nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output.
30303131::: {.warning}
3232-`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
3232+`nix-env` silently disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
33333434```ShellSession
3535$ nix-env -iA nixpkgs.coreutils.info
+2-2
doc/stdenv/stdenv.chapter.md
···719719720720##### `dontStripHost` {#var-stdenv-dontStripHost}
721721722722-Like `dontStrip`, but only affects the `strip` command targetting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
722722+Like `dontStrip`, but only affects the `strip` command targeting the package’s host platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
723723724724##### `dontStripTarget` {#var-stdenv-dontStripTarget}
725725726726-Like `dontStrip`, but only affects the `strip` command targetting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
726726+Like `dontStrip`, but only affects the `strip` command targeting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
727727728728##### `dontMoveSbin` {#var-stdenv-dontMoveSbin}
729729
+1-1
lib/attrsets.nix
···757757 matchAttrs :: AttrSet -> AttrSet -> Bool
758758 */
759759 matchAttrs =
760760- # Attribute set strucutre to match
760760+ # Attribute set structure to match
761761 pattern:
762762 # Attribute set to find patterns in
763763 attrs:
+1-1
lib/derivations.nix
···1717 situations below.
18181919 For illustration and/or testing, we define derivation such that its
2020- evaluation is very noticable.
2020+ evaluation is very noticeable.
21212222 let derivation = throw "This won't be evaluated.";
2323
+1-1
lib/modules.nix
···479479 ) (lib.functionArgs f);
480480481481 # Note: we append in the opposite order such that we can add an error
482482- # context on the explicited arguments of "args" too. This update
482482+ # context on the explicit arguments of "args" too. This update
483483 # operator is used to make the "args@{ ... }: with args.lib;" notation
484484 # works.
485485 in f (args // extraArgs)
+2-2
lib/strings.nix
···185185 */
186186 makeBinPath = makeSearchPathOutput "bin" "bin";
187187188188- /* Normalize path, removing extranous /s
188188+ /* Normalize path, removing extraneous /s
189189190190 Type: normalizePath :: string -> string
191191···330330 */
331331 escape = list: replaceStrings list (map (c: "\\${c}") list);
332332333333- /* Escape occurence of the element of `list` in `string` by
333333+ /* Escape occurrence of the element of `list` in `string` by
334334 converting to its ASCII value and prefixing it with \\x.
335335 Only works for printable ascii characters.
336336
+1-1
lib/systems/architectures.nix
···6767 #
6868 # Note:
6969 #
7070- # - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
7070+ # - The successors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
7171 # which no current AMD Zen michroarch support.
7272 # - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
7373 # current Intel microarch support.
+2-2
lib/systems/default.nix
···2020 # necessary.
2121 #
2222 # `parsed` is inferred from args, both because there are two options with one
2323- # clearly prefered, and to prevent cycles. A simpler fixed point where the RHS
2323+ # clearly preferred, and to prevent cycles. A simpler fixed point where the RHS
2424 # always just used `final.*` would fail on both counts.
2525 elaborate = args': let
2626 args = if lib.isString args' then { system = args'; }
···6262 linker =
6363 /**/ if final.useLLVM or false then "lld"
6464 else if final.isDarwin then "cctools"
6565- # "bfd" and "gold" both come from GNU binutils. The existance of Gold
6565+ # "bfd" and "gold" both come from GNU binutils. The existence of Gold
6666 # is why we use the more obscure "bfd" and not "binutils" for this
6767 # choice.
6868 else "bfd";
+1-1
lib/systems/flake-systems.nix
···11# See [RFC 46] for mandated platform support and ../../pkgs/stdenv for
22# implemented platform support. This list is mainly descriptive, i.e. all
33-# system doubles for platforms where nixpkgs can do native compiliation
33+# system doubles for platforms where nixpkgs can do native compilation
44# reasonably well are included.
55#
66# [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
+1-1
lib/tests/modules.sh
···246246## Freeform modules
247247# Assigning without a declared option should work
248248checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
249249-# No freeform assigments shouldn't make it error
249249+# No freeform assignments shouldn't make it error
250250checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
251251# but only if the type matches
252252checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
···77available to processes through the `/sys` and
88`/proc` filesystems. It also disables the User Namespaces
99feature of the kernel, which stops Nix from being able to build anything
1010-(this particular setting can be overriden via
1010+(this particular setting can be overridden via
1111[](#opt-security.allowUserNamespaces)). See the
1212[profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix)
1313for further detail on which settings are altered.
···34343535An activation script can write to special files instructing
3636`switch-to-configuration` to restart/reload units. The script will take these
3737-requests into account and will incorperate the unit configuration as described
3737+requests into account and will incorporate the unit configuration as described
3838above. This means that the activation script will "fake" a modified unit file
3939and `switch-to-configuration` will act accordingly. By doing so, configuration
4040like [systemd.services.\<name\>.restartIfChanged](#opt-systemd.services) is
···4949`/run/nixos/dry-activation-reload-list`. Those files can contain
5050newline-separated lists of unit names where duplicates are being ignored. These
5151files are not create automatically and activation scripts must take the
5252-possiblility into account that they have to create them first.
5252+possibility into account that they have to create them first.
53535454## NixOS snippets {#sec-activation-script-nixos-snippets}
5555
···345345It takes a parameter *`o`*, that should be a set, or a function returning
346346a set with an `options` key defining the sub-options. Submodule option
347347definitions are type-checked accordingly to the `options` declarations.
348348-Of course, you can nest submodule option definitons for even higher
348348+Of course, you can nest submodule option definitions for even higher
349349modularity.
350350351351The option set can be defined directly
···298298299299: Wait until the supplied regular expressions match a line of the
300300 serial console output. This method is useful when OCR is not
301301- possibile or accurate enough.
301301+ possible or accurate enough.
302302303303`wait_for_window`
304304···351351`start_job` and `stop_job`.
352352353353For faster dev cycles it\'s also possible to disable the code-linters
354354-(this shouldn\'t be commited though):
354354+(this shouldn\'t be committed though):
355355356356```nix
357357{
···99 available to processes through the <literal>/sys</literal> and
1010 <literal>/proc</literal> filesystems. It also disables the User
1111 Namespaces feature of the kernel, which stops Nix from being able to
1212- build anything (this particular setting can be overriden via
1212+ build anything (this particular setting can be overridden via
1313 <xref linkend="opt-security.allowUserNamespaces" />). See the
1414 <link xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">profile
1515 source</link> for further detail on which settings are altered.
···4545 An activation script can write to special files instructing
4646 <literal>switch-to-configuration</literal> to restart/reload units.
4747 The script will take these requests into account and will
4848- incorperate the unit configuration as described above. This means
4848+ incorporate the unit configuration as described above. This means
4949 that the activation script will <quote>fake</quote> a modified unit
5050 file and <literal>switch-to-configuration</literal> will act
5151 accordingly. By doing so, configuration like
···6666 <literal>/run/nixos/dry-activation-reload-list</literal>. Those
6767 files can contain newline-separated lists of unit names where
6868 duplicates are being ignored. These files are not create
6969- automatically and activation scripts must take the possiblility into
6969+ automatically and activation scripts must take the possibility into
7070 account that they have to create them first.
7171 </para>
7272 <section xml:id="sec-activation-script-nixos-snippets">
···712712 <literal>options</literal> key defining the sub-options. Submodule
713713 option definitions are type-checked accordingly to the
714714 <literal>options</literal> declarations. Of course, you can nest
715715- submodule option definitons for even higher modularity.
715715+ submodule option definitions for even higher modularity.
716716 </para>
717717 <para>
718718 The option set can be defined directly
···536536 <para>
537537 Wait until the supplied regular expressions match a line of
538538 the serial console output. This method is useful when OCR is
539539- not possibile or accurate enough.
539539+ not possible or accurate enough.
540540 </para>
541541 </listitem>
542542 </varlistentry>
···631631 </para>
632632 <para>
633633 For faster dev cycles it's also possible to disable the
634634- code-linters (this shouldn't be commited though):
634634+ code-linters (this shouldn't be committed though):
635635 </para>
636636 <programlisting language="bash">
637637{
···2424 </itemizedlist>
2525 <para>
2626 System images, such as the live installer ones, know how to enforce
2727- configuration settings on wich they immediately depend in order to
2727+ configuration settings on which they immediately depend in order to
2828 work correctly.
2929 </para>
3030 <para>
···102102 it needs at a minimum for correct functioning, while the installer
103103 base image overrides the entire file system layout because there
104104 can’t be any other guarantees on a live medium than those given by
105105- the live medium itself. The latter is especially true befor
105105+ the live medium itself. The latter is especially true before
106106 formatting the target block device(s). On the other hand, the
107107 netboot iso only overrides its minimum dependencies since netboot
108108 images are always made-to-target.
···223223 <para>
224224 You'll likely want to set a root password for your first boot
225225 using the configuration files because you won't have a chance to
226226- enter a password until after you reboot. You can initalize the
226226+ enter a password until after you reboot. You can initialize the
227227 root password to an empty one with this line: (and of course
228228 don't forget to set one once you've rebooted or to lock the
229229 account with <literal>sudo passwd -l root</literal> if you use
···11-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-instaling-virtualbox-guest">
11+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-virtualbox-guest">
22 <title>Installing in a VirtualBox guest</title>
33 <para>
44 Installing NixOS into a VirtualBox guest is convenient for users who
···256256 </para>
257257 <para>
258258 On the minimal installer, NetworkManager is not available, so
259259- configuration must be perfomed manually. To configure the wifi,
259259+ configuration must be performed manually. To configure the wifi,
260260 first start wpa_supplicant with
261261 <literal>sudo systemctl start wpa_supplicant</literal>, then run
262262 <literal>wpa_cli</literal>. For most home networks, you need to
···545545 <literal>services.udev.extraRules</literal> option now writes
546546 rules to <literal>99-local.rules</literal> instead of
547547 <literal>10-local.rules</literal>. This makes all the user rules
548548- apply after others, so their results wouldn't be overriden by
548548+ apply after others, so their results wouldn't be overridden by
549549 anything else.
550550 </para>
551551 </listitem>
···666666 <listitem>
667667 <para>
668668 <literal>services.firefox.syncserver</literal> now runs by
669669- default as a non-root user. To accomodate this change, the
669669+ default as a non-root user. To accommodate this change, the
670670 default sqlite database location has also been changed.
671671 Migration should work automatically. Refer to the description
672672 of the options for more details.
···271271 <listitem>
272272 <para>
273273 The versioned <literal>postgresql</literal> have been renamed
274274- to use underscore number seperators. For example,
274274+ to use underscore number separators. For example,
275275 <literal>postgresql96</literal> has been renamed to
276276 <literal>postgresql_9_6</literal>.
277277 </para>
···498498 <listitem>
499499 <para>
500500 The <literal>prometheus-nginx-exporter</literal> package now
501501- uses the offical exporter provided by NGINX Inc. Its metrics
501501+ uses the official exporter provided by NGINX Inc. Its metrics
502502 are differently structured and are incompatible to the old
503503 ones. For information about the metrics, have a look at the
504504 <link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official
···524524 <para>
525525 By default, prometheus exporters are now run with
526526 <literal>DynamicUser</literal> enabled. Exporters that need a
527527- real user, now run under a seperate user and group which
527527+ real user, now run under a separate user and group which
528528 follow the pattern
529529 <literal><exporter-name>-exporter</literal>, instead of
530530 the previous default <literal>nobody</literal> and
···13041304 <listitem>
13051305 <para>
13061306 In the ACME module, the data used to build the hash for the
13071307- account directory has changed to accomodate new features to
13071307+ account directory has changed to accommodate new features to
13081308 reduce account rate limit issues. This will trigger new
13091309 account creation on the first rebuild following this update.
13101310 No issues are expected to arise from this, thanks to the new
···328328 <listitem>
329329 <para>
330330 <link xlink:href="https://maddy.email/">Maddy</link>, a free
331331- an open source mail server. Availabe as
331331+ an open source mail server. Available as
332332 <link linkend="opt-services.maddy.enable">services.maddy</link>.
333333 </para>
334334 </listitem>
···14221422 derivation if <literal>name</literal> is
14231423 <literal>"vim"</literal> (the default). This
14241424 makes the <literal>wrapManual</literal> argument obsolete,
14251425- but this behavior can be overriden by setting the
14251425+ but this behavior can be overridden by setting the
14261426 <literal>standalone</literal> argument.
14271427 </para>
14281428 </listitem>
···12801280 </listitem>
12811281 <listitem>
12821282 <para>
12831283- Option descriptions, examples, and defaults writting in
12841284- DocBook are now deprecated. Using CommonMark is preferred and
12851285- will become the default in a future release.
12831283+ Option descriptions, examples, and defaults writing in DocBook
12841284+ are now deprecated. Using CommonMark is preferred and will
12851285+ become the default in a future release.
12861286 </para>
12871287 </listitem>
12881288 <listitem>
···114114 <link linkend="opt-services.snapserver.openFirewall">services.snapserver.openFirewall</link>
115115 module option default value has been changed from
116116 <literal>true</literal> to <literal>false</literal>. You will
117117- need to explicitely set this option to
118118- <literal>true</literal>, or configure your firewall.
117117+ need to explicitly set this option to <literal>true</literal>,
118118+ or configure your firewall.
119119 </para>
120120 </listitem>
121121 <listitem>
···124124 <link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>
125125 module option default value has been changed from
126126 <literal>true</literal> to <literal>false</literal>. You will
127127- need to explicitely set this option to
128128- <literal>true</literal>, or configure your firewall.
127127+ need to explicitly set this option to <literal>true</literal>,
128128+ or configure your firewall.
129129 </para>
130130 </listitem>
131131 <listitem>
···134134 <link linkend="opt-services.unifi-video.openFirewall">services.unifi-video.openFirewall</link>
135135 module option default value has been changed from
136136 <literal>true</literal> to <literal>false</literal>. You will
137137- need to explicitely set this option to
138138- <literal>true</literal>, or configure your firewall.
137137+ need to explicitly set this option to <literal>true</literal>,
138138+ or configure your firewall.
139139 </para>
140140 </listitem>
141141 <listitem>
···99- Combine them with (any of) your host config(s)
10101111System images, such as the live installer ones, know how to enforce configuration settings
1212-on wich they immediately depend in order to work correctly.
1212+on which they immediately depend in order to work correctly.
13131414However, if you are confident, you can opt to override those
1515enforced values with `mkForce`.
···7575For example, the iso base image overrides those file systems which it needs at a minimum
7676for correct functioning, while the installer base image overrides the entire file system
7777layout because there can't be any other guarantees on a live medium than those given
7878-by the live medium itself. The latter is especially true befor formatting the target
7878+by the live medium itself. The latter is especially true before formatting the target
7979block device(s). On the other hand, the netboot iso only overrides its minimum dependencies
8080since netboot images are always made-to-target.
···158158159159 You\'ll likely want to set a root password for your first boot using
160160 the configuration files because you won\'t have a chance to enter a
161161- password until after you reboot. You can initalize the root password
161161+ password until after you reboot. You can initialize the root password
162162 to an empty one with this line: (and of course don\'t forget to set
163163 one once you\'ve rebooted or to lock the account with
164164 `sudo passwd -l root` if you use `sudo`)
···11-# Installing in a VirtualBox guest {#sec-instaling-virtualbox-guest}
11+# Installing in a VirtualBox guest {#sec-installing-virtualbox-guest}
2233Installing NixOS into a VirtualBox guest is convenient for users who
44want to try NixOS without installing it on bare metal. If you want to
···162162`systemctl stop NetworkManager`.
163163164164On the minimal installer, NetworkManager is not available, so
165165-configuration must be perfomed manually. To configure the wifi, first
165165+configuration must be performed manually. To configure the wifi, first
166166start wpa_supplicant with `sudo systemctl start wpa_supplicant`, then
167167run `wpa_cli`. For most home networks, you need to type in the following
168168commands:
+1-1
nixos/doc/manual/release-notes/rl-1603.section.md
···202202 }
203203 ```
204204205205-- `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn\'t be overriden by anything else.
205205+- `services.udev.extraRules` option now writes rules to `99-local.rules` instead of `10-local.rules`. This makes all the user rules apply after others, so their results wouldn\'t be overridden by anything else.
206206207207- Large parts of the `services.gitlab` module has been been rewritten. There are new configuration options available. The `stateDir` option was renamned to `statePath` and the `satellitesDir` option was removed. Please review the currently available options.
208208
+1-1
nixos/doc/manual/release-notes/rl-1709.section.md
···238238239239- `cc-wrapper`\'s setup-hook now exports a number of environment variables corresponding to binutils binaries, (e.g. `LD`, `STRIP`, `RANLIB`, etc). This is done to prevent packages\' build systems guessing, which is harder to predict, especially when cross-compiling. However, some packages have broken due to this---their build systems either not supporting, or claiming to support without adequate testing, taking such environment variables as parameters.
240240241241-- `services.firefox.syncserver` now runs by default as a non-root user. To accomodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details.
241241+- `services.firefox.syncserver` now runs by default as a non-root user. To accommodate this change, the default sqlite database location has also been changed. Migration should work automatically. Refer to the description of the options for more details.
242242243243- The `compiz` window manager and package was removed. The system support had been broken for several years.
244244
+1-1
nixos/doc/manual/release-notes/rl-1903.section.md
···73737474- OpenSMTPD has been upgraded to version 6.4.0p1. This release makes backwards-incompatible changes to the configuration file format. See `man smtpd.conf` for more information on the new file format.
75757676-- The versioned `postgresql` have been renamed to use underscore number seperators. For example, `postgresql96` has been renamed to `postgresql_9_6`.
7676+- The versioned `postgresql` have been renamed to use underscore number separators. For example, `postgresql96` has been renamed to `postgresql_9_6`.
77777878- Package `consul-ui` and passthrough `consul.ui` have been removed. The package `consul` now uses upstream releases that vendor the UI into the binary. See [\#48714](https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834) for details.
7979
+2-2
nixos/doc/manual/release-notes/rl-1909.section.md
···154154155155- The setopt declarations will be evaluated at the end of `/etc/zshrc`, so any code in [programs.zsh.interactiveShellInit](options.html#opt-programs.zsh.interactiveShellInit), [programs.zsh.loginShellInit](options.html#opt-programs.zsh.loginShellInit) and [programs.zsh.promptInit](options.html#opt-programs.zsh.promptInit) may break if it relies on those options being set.
156156157157-- The `prometheus-nginx-exporter` package now uses the offical exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the [official repo](https://github.com/nginxinc/nginx-prometheus-exporter).
157157+- The `prometheus-nginx-exporter` package now uses the official exporter provided by NGINX Inc. Its metrics are differently structured and are incompatible to the old ones. For information about the metrics, have a look at the [official repo](https://github.com/nginxinc/nginx-prometheus-exporter).
158158159159- The `shibboleth-sp` package has been updated to version 3. It is largely backward compatible, for further information refer to the [release notes](https://wiki.shibboleth.net/confluence/display/SP3/ReleaseNotes) and [upgrade guide](https://wiki.shibboleth.net/confluence/display/SP3/UpgradingFromV2).
160160161161 Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
162162163163-- By default, prometheus exporters are now run with `DynamicUser` enabled. Exporters that need a real user, now run under a seperate user and group which follow the pattern `<exporter-name>-exporter`, instead of the previous default `nobody` and `nogroup`. Only some exporters are affected by the latter, namely the exporters `dovecot`, `node`, `postfix` and `varnish`.
163163+- By default, prometheus exporters are now run with `DynamicUser` enabled. Exporters that need a real user, now run under a separate user and group which follow the pattern `<exporter-name>-exporter`, instead of the previous default `nobody` and `nogroup`. Only some exporters are affected by the latter, namely the exporters `dovecot`, `node`, `postfix` and `varnish`.
164164165165- The `ibus-qt` package is not installed by default anymore when [i18n.inputMethod.enabled](options.html#opt-i18n.inputMethod.enabled) is set to `ibus`. If IBus support in Qt 4.x applications is required, add the `ibus-qt` package to your [environment.systemPackages](options.html#opt-environment.systemPackages) manually.
166166
+1-1
nixos/doc/manual/release-notes/rl-2105.section.md
···369369370370- The zookeeper package does not provide `zooInspector.sh` anymore, as that \"contrib\" has been dropped from upstream releases.
371371372372-- In the ACME module, the data used to build the hash for the account directory has changed to accomodate new features to reduce account rate limit issues. This will trigger new account creation on the first rebuild following this update. No issues are expected to arise from this, thanks to the new account creation handling.
372372+- In the ACME module, the data used to build the hash for the account directory has changed to accommodate new features to reduce account rate limit issues. This will trigger new account creation on the first rebuild following this update. No issues are expected to arise from this, thanks to the new account creation handling.
373373374374- [users.users._name_.createHome](options.html#opt-users.users._name_.createHome) now always ensures home directory permissions to be `0700`. Permissions had previously been ignored for already existing home directories, possibly leaving them readable by others. The option\'s description was incorrect regarding ownership management and has been simplified greatly.
375375
+2-2
nixos/doc/manual/release-notes/rl-2205.section.md
···107107108108- [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. Available as [services.kanidm](#opt-services.kanidm.enableServer)
109109110110-- [Maddy](https://maddy.email/), a free an open source mail server. Availabe as [services.maddy](#opt-services.maddy.enable).
110110+- [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable).
111111112112- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable).
113113···562562- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code
563563564564- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:
565565- * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument.
565565+ * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overridden by setting the `standalone` argument.
566566 * All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete.
567567 * The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name.
568568
+1-1
nixos/doc/manual/release-notes/rl-2211.section.md
···385385386386- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
387387388388-- Option descriptions, examples, and defaults writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release.
388388+- Option descriptions, examples, and defaults writing in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release.
389389390390- The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete.
391391
+3-3
nixos/doc/manual/release-notes/rl-2305.section.md
···37373838- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/).
39394040-- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
4040+- The [services.snapserver.openFirewall](#opt-services.snapserver.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall.
41414242-- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
4242+- The [services.tmate-ssh-server.openFirewall](#opt-services.tmate-ssh-server.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall.
43434444-- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitely set this option to `true`, or configure your firewall.
4444+- The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall.
45454646- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.
4747
+1-1
nixos/lib/make-options-doc/default.nix
···1919{ pkgs
2020, lib
2121, options
2222-, transformOptions ? lib.id # function for additional tranformations of the options
2222+, transformOptions ? lib.id # function for additional transformations of the options
2323, documentType ? "appendix" # TODO deprecate "appendix" in favor of "none"
2424 # and/or rename function to moduleOptionDoc for clean slate
2525
+1-1
nixos/modules/hardware/gpgsmartcards.nix
···88 # https://salsa.debian.org/debian/gnupg2/-/blob/debian/main/debian/scdaemon.udev
991010 # the latest rev of the entire debian gnupg2 repo as of 2021-04-28
1111- # the scdaemon.udev file was last commited on 2021-01-05 (7817a03):
1111+ # the scdaemon.udev file was last committed on 2021-01-05 (7817a03):
1212 scdaemonUdevRev = "01898735a015541e3ffb43c7245ac1e612f40836";
13131414 scdaemonRules = pkgs.fetchurl {
+1-1
nixos/modules/hardware/openrazer.nix
···110110 boot.extraModulePackages = [ kernelPackages.openrazer ];
111111 boot.kernelModules = drivers;
112112113113- # Makes the man pages available so you can succesfully run
113113+ # Makes the man pages available so you can successfully run
114114 # > systemctl --user help openrazer-daemon
115115 environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ];
116116
+1-1
nixos/modules/hardware/printers.nix
···100100 default = {};
101101 description = lib.mdDoc ''
102102 Sets PPD options for the printer.
103103- {command}`lpoptions [-p printername] -l` shows suported PPD options for the given printer.
103103+ {command}`lpoptions [-p printername] -l` shows supported PPD options for the given printer.
104104 '';
105105 };
106106 };
+1-1
nixos/modules/installer/cd-dvd/iso-image.nix
···81818282 # The configuration file for syslinux.
83838484- # Notes on syslinux configuration and UNetbootin compatiblity:
8484+ # Notes on syslinux configuration and UNetbootin compatibility:
8585 # * Do not use '/syslinux/syslinux.cfg' as the path for this
8686 # configuration. UNetbootin will not parse the file and use it as-is.
8787 # This results in a broken configuration if the partition label does
+1-1
nixos/modules/misc/label.nix
···2727 variable (defaults to the value of
2828 {option}`system.nixos.version`).
29293030- Can be overriden by setting {env}`NIXOS_LABEL`.
3030+ Can be overridden by setting {env}`NIXOS_LABEL`.
31313232 Useful for not loosing track of configurations built from different
3333 nixos branches/revisions, e.g.:
+2-2
nixos/modules/security/acme/default.nix
···714714 default = false;
715715 description = lib.mdDoc ''
716716 Whether to use the root user when generating certs. This is not recommended
717717- for security + compatiblity reasons. If a service requires root owned certificates
717717+ for security + compatibility reasons. If a service requires root owned certificates
718718 consider following the guide on "Using ACME with services demanding root
719719 owned certificates" in the NixOS manual, and only using this as a fallback
720720 or for testing.
···765765 To use the let's encrypt staging server, use security.acme.server =
766766 "https://acme-staging-v02.api.letsencrypt.org/directory".
767767 '')
768768- (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
768768+ (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
769769 (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
770770 (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
771771 (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600)))
+1-1
nixos/modules/security/apparmor.nix
···202202 # (indirectly read from /etc/apparmor.d/*, without recursing into sub-directory).
203203 # Note that this does not remove profiles dynamically generated by libvirt.
204204 [ "${pkgs.apparmor-utils}/bin/aa-remove-unknown" ] ++
205205- # Optionaly kill the processes which are unconfined but now have a profile loaded
205205+ # Optionally kill the processes which are unconfined but now have a profile loaded
206206 # (because AppArmor can only start to confine new processes).
207207 optional cfg.killUnconfinedConfinables killUnconfinedConfinables;
208208 ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown";
+2-2
nixos/modules/security/pam.nix
···282282 defaultText = literalExpression "config.security.pam.mount.enable";
283283 type = types.bool;
284284 description = lib.mdDoc ''
285285- Enable PAM mount (pam_mount) system to mount fileystems on user login.
285285+ Enable PAM mount (pam_mount) system to mount filesystems on user login.
286286 '';
287287 };
288288···305305 default = false;
306306 type = types.bool;
307307 description = lib.mdDoc ''
308308- Wheather the delay after typing a wrong password should be disabled.
308308+ Whether the delay after typing a wrong password should be disabled.
309309 '';
310310 };
311311
+1-1
nixos/modules/security/pam_mount.nix
···2424 type = types.bool;
2525 default = false;
2626 description = lib.mdDoc ''
2727- Enable PAM mount system to mount fileystems on user login.
2727+ Enable PAM mount system to mount filesystems on user login.
2828 '';
2929 };
3030
+1-1
nixos/modules/security/wrappers/default.nix
···202202 internal = true;
203203 description = lib.mdDoc ''
204204 This option defines the path to the wrapper programs. It
205205- should not be overriden.
205205+ should not be overridden.
206206 '';
207207 };
208208 };
+1-1
nixos/modules/services/audio/icecast.nix
···48484949 hostname = mkOption {
5050 type = types.nullOr types.str;
5151- description = lib.mdDoc "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided.";
5151+ description = lib.mdDoc "DNS name or IP address that will be used for the stream directory lookups or possibly the playlist generation if a Host header is not provided.";
5252 default = config.networking.domain;
5353 defaultText = literalExpression "config.networking.domain";
5454 };
+2-2
nixos/modules/services/backup/zfs-replication.nix
···1212 enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication.");
13131414 followDelete = mkOption {
1515- description = lib.mdDoc "Remove remote snapshots that don't have a local correspondant.";
1515+ description = lib.mdDoc "Remove remote snapshots that don't have a local correspondent.";
1616 default = true;
1717 type = types.bool;
1818 };
···3030 };
31313232 localFilesystem = mkOption {
3333- description = lib.mdDoc "Local ZFS fileystem from which snapshots should be sent. Defaults to the attribute name.";
3333+ description = lib.mdDoc "Local ZFS filesystem from which snapshots should be sent. Defaults to the attribute name.";
3434 example = "pool/file/path";
3535 type = types.str;
3636 };
+3-3
nixos/modules/services/backup/znapzend.nix
···99 The znapzend backup plan to use for the source.
10101111 The plan specifies how often to backup and for how long to keep the
1212- backups. It consists of a series of retention periodes to interval
1212+ backups. It consists of a series of retention periods to interval
1313 associations:
14141515 ```
···268268269269 mkSrcAttrs = srcCfg: with srcCfg; {
270270 enabled = onOff enable;
271271- # mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target
271271+ # mbuffer is not referenced by its full path to accommodate non-NixOS systems or differing mbuffer versions between source and target
272272 mbuffer = with mbuffer; if enable then "mbuffer"
273273 + optionalString (port != null) ":${toString port}" else "off";
274274 mbuffer_size = mbuffer.size;
···372372 compressed feature which adds the options `-Lce` to
373373 the {command}`zfs send` command. When this is enabled, make
374374 sure that both the sending and receiving pool have the same relevant
375375- features enabled. Using `-c` will skip unneccessary
375375+ features enabled. Using `-c` will skip unnecessary
376376 decompress-compress stages, `-L` is for large block
377377 support and -e is for embedded data support. see
378378 {manpage}`znapzend(1)`
···5151 type = types.bool;
5252 default = false;
5353 description = lib.mdDoc ''
5454- Explictly disables syncing of deposit logs from the execution node.
5454+ Explicitly disables syncing of deposit logs from the execution node.
5555 This overrides any previous option that depends on it.
5656 Useful if you intend to run a non-validating beacon node.
5757 '';
···22222323 bootstrapAddons = mkOption {
2424 description = lib.mdDoc ''
2525- Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths.
2525+ Bootstrap addons are like regular addons, but they are applied with cluster-admin rights.
2626 They are applied at addon-manager startup only.
2727 '';
2828 default = { };
+1-1
nixos/modules/services/cluster/kubernetes/pki.nix
···323323 systemctl restart flannel
324324 ''}
325325326326- echo "Node joined succesfully"
326326+ echo "Node joined successfully"
327327 '')];
328328329329 # isolate etcd on loopback at the master node
···4949 registration token on startup as needed. Make sure the PAT has a scope of
5050 `admin:org` for organization-wide registrations or a scope of
5151 `repo` for a single repository. Fine-grained PATs need read and write permission
5252- to the "Adminstration" resources.
5252+ to the "Administration" resources.
53535454 Changing this option or the file's content triggers a new runner registration.
5555 '';
···141141 default = false;
142142 description = lib.mdDoc ''
143143 Finish all remaining jobs before stopping.
144144- If not set gitlab-runner will stop immediatly without waiting
144144+ If not set gitlab-runner will stop immediately without waiting
145145 for jobs to finish, which will lead to failed builds.
146146 '';
147147 };
···1515 default = false;
1616 description = lib.mdDoc ''
1717 Enables the Hail Auto Update Service. Hail can automatically deploy artifacts
1818- built by a Hydra Continous Integration server. A common use case is to provide
1919- continous deployment for single services or a full NixOS configuration.'';
1818+ built by a Hydra Continuous Integration server. A common use case is to provide
1919+ continuous deployment for single services or a full NixOS configuration.'';
2020 };
2121 profile = mkOption {
2222 type = types.str;
+1-1
nixos/modules/services/databases/firebird.nix
···1414#
1515# Be careful, virtuoso-opensource also provides a different isql command !
16161717-# There are at least two ways to run firebird. superserver has been choosen
1717+# There are at least two ways to run firebird. superserver has been chosen
1818# however there are no strong reasons to prefer this or the other one AFAIK
1919# Eg superserver is said to be most efficiently using resources according to
2020# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html
···4545 default = !(cfg.settings ? initial_session);
4646 defaultText = literalExpression "!(config.services.greetd.settings ? initial_session)";
4747 description = lib.mdDoc ''
4848- Wether to restart greetd when it terminates (e.g. on failure).
4848+ Whether to restart greetd when it terminates (e.g. on failure).
4949 This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin),
5050 because every greetd restart will trigger the autologin again.
5151 '';
+3-3
nixos/modules/services/games/asf.nix
···3535 description = lib.mdDoc ''
3636 If enabled, starts the ArchisSteamFarm service.
3737 For configuring the SteamGuard token you will need to use the web-ui, which is enabled by default over on 127.0.0.1:1242.
3838- You cannot configure ASF in any way outside of nix, since all the config files get wiped on restart and replaced with the programatically set ones by nix.
3838+ You cannot configure ASF in any way outside of nix, since all the config files get wiped on restart and replaced with the programnatically set ones by nix.
3939 '';
4040 default = false;
4141 };
···9898 ipcPasswordFile = mkOption {
9999 type = types.nullOr types.path;
100100 default = null;
101101- description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group.";
101101+ description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group.";
102102 };
103103104104 ipcSettings = mkOption {
···129129 };
130130 passwordFile = mkOption {
131131 type = types.path;
132132- description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group.";
132132+ description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group.";
133133 };
134134 enabled = mkOption {
135135 type = types.bool;
+1-1
nixos/modules/services/games/minetest-server.nix
···6262 Path to logfile for logging.
63636464 If set to null, logging will be output to stdout which means
6565- all output will be catched by systemd.
6565+ all output will be caught by systemd.
6666 '';
6767 };
6868
···141141 description = lib.mdDoc ''
142142 Enable saned network daemon for remote connection to scanners.
143143144144- saned would be runned from `scanner` user; to allow
144144+ saned would be run from `scanner` user; to allow
145145 access to hardware that doesn't have `scanner` group
146146 you should add needed groups to this user.
147147 '';
+1-1
nixos/modules/services/logging/logrotate.nix
···163163 default = null;
164164 description = lib.mdDoc ''
165165 How often to rotate the logs. Defaults to previously set global setting,
166166- which itself defauts to weekly.
166166+ which itself defaults to weekly.
167167 '';
168168 };
169169
+1-1
nixos/modules/services/mail/mailman.nix
···113113 type = types.str;
114114 example = "/run/secrets/ldap-bind";
115115 description = lib.mdDoc ''
116116- Path to the file containing the bind password of the servie account
116116+ Path to the file containing the bind password of the service account
117117 defined by [](#opt-services.mailman.ldap.bindDn).
118118 '';
119119 };
+3-3
nixos/modules/services/mail/postfix.nix
···234234235235 headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks;
236236237237- aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in
237237+ aliases = let separator = if cfg.aliasMapType == "hash" then ":" else ""; in
238238 optionalString (cfg.postmasterAlias != "") ''
239239- postmaster${seperator} ${cfg.postmasterAlias}
239239+ postmaster${separator} ${cfg.postmasterAlias}
240240 ''
241241 + optionalString (cfg.rootAlias != "") ''
242242- root${seperator} ${cfg.rootAlias}
242242+ root${separator} ${cfg.rootAlias}
243243 ''
244244 + cfg.extraAliases
245245 ;
+2-2
nixos/modules/services/mail/roundcube.nix
···3939 '';
40404141 description = lib.mdDoc ''
4242- The package which contains roundcube's sources. Can be overriden to create
4242+ The package which contains roundcube's sources. Can be overridden to create
4343 an environment which contains roundcube and third-party plugins.
4444 '';
4545 };
···9292 default = [];
9393 example = literalExpression "with pkgs.aspellDicts; [ en fr de ]";
9494 description = lib.mdDoc ''
9595- List of aspell dictionnaries for spell checking. If empty, spell checking is disabled.
9595+ List of aspell dictionaries for spell checking. If empty, spell checking is disabled.
9696 '';
9797 };
9898
···105105 `MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN`.
106106107107 These environment variables can also be used to set other options by
108108- replacing hierachy levels by `.`, converting the name to uppercase
108108+ replacing hierarchy levels by `.`, converting the name to uppercase
109109 and prepending `MAUTRIX_TELEGRAM_`.
110110 For example, the first value above maps to
111111 {option}`settings.appservice.as_token`.
···140140 path = [ pkgs.lottieconverter ];
141141142142 # mautrix-telegram tries to generate a dotfile in the home directory of
143143- # the running user if using a postgresql databse:
143143+ # the running user if using a postgresql database:
144144 #
145145 # File "python3.10/site-packages/asyncpg/connect_utils.py", line 257, in _dot_postgre>
146146 # return (pathlib.Path.home() / '.postgresql' / filename).resolve()
+1-1
nixos/modules/services/matrix/synapse.nix
···8080 (mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." )
8181 (mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." )
82828383- # options that were moved into rfc42 style settigns
8383+ # options that were moved into rfc42 style settings
8484 (mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_files instead" )
8585 (mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" )
8686 (mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" )
+1-1
nixos/modules/services/misc/dysnomia.nix
···114114 };
115115116116 components = mkOption {
117117- description = lib.mdDoc "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state";
117117+ description = lib.mdDoc "An attribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state";
118118 default = {};
119119 type = types.attrsOf types.attrs;
120120 };
+1-1
nixos/modules/services/misc/gammu-smsd.nix
···192192 password = mkOption {
193193 type = types.nullOr types.str;
194194 default = null;
195195- description = lib.mdDoc "User password used for connetion to the database";
195195+ description = lib.mdDoc "User password used for connection to the database";
196196 };
197197 };
198198 };
+2-2
nixos/modules/services/misc/gitea.nix
···183183 file = mkOption {
184184 type = types.nullOr types.str;
185185 default = null;
186186- description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is choosen by gitea.";
186186+ description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is chosen by gitea.";
187187 example = "gitea-dump";
188188 };
189189 };
···487487488488 # In older versions the secret naming for JWT was kind of confusing.
489489 # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET
490490- # wasn't persistant at all.
490490+ # wasn't persistent at all.
491491 # To fix that, there is now the file oauth2_jwt_secret containing the
492492 # values for JWT_SECRET and the file jwt_secret gets renamed to
493493 # lfs_jwt_secret.
+1-1
nixos/modules/services/misc/gitlab.xml
···141141 </para>
142142143143 <para>
144144- A list of all availabe rake tasks can be obtained by running:
144144+ A list of all available rake tasks can be obtained by running:
145145<screen>
146146<prompt>$ </prompt>sudo -u git -H gitlab-rake -T
147147</screen>
···609609610610 By default, pseudo-features `nixos-test`, `benchmark`,
611611 and `big-parallel` used in Nixpkgs are set, `kvm`
612612- is also included in it is avaliable.
612612+ is also included in it is available.
613613 '';
614614 };
615615···642642 description = lib.mdDoc ''
643643 Configuration for Nix, see
644644 <https://nixos.org/manual/nix/stable/#sec-conf-file> or
645645- {manpage}`nix.conf(5)` for avalaible options.
645645+ {manpage}`nix.conf(5)` for available options.
646646 The value declared here will be translated directly to the key-value pairs Nix expects.
647647648648 You can use {command}`nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings`
+1-1
nixos/modules/services/misc/podgrab.nix
···1212 example = "/run/secrets/password.env";
1313 description = lib.mdDoc ''
1414 The path to a file containing the PASSWORD environment variable
1515- definition for Podgrab's authentification.
1515+ definition for Podgrab's authentication.
1616 '';
1717 };
1818
+1-1
nixos/modules/services/misc/portunus.nix
···135135 type = types.bool;
136136 default = false;
137137 description = lib.mdDoc ''
138138- Wether to enable LDAPS protocol.
138138+ Whether to enable LDAPS protocol.
139139 This also adds two entries to the `/etc/hosts` file to point [](#opt-services.portunus.domain) to localhost,
140140 so that CLIs and programs can use ldaps protocol and verify the certificate without opening the firewall port for the protocol.
141141
···7171 # Note that each systemd service gets its own ${runDir}/config.ini file.
7272 ExecStartPre = mkBefore [("+"+pkgs.writeShellScript "${serviceName}-credentials" ''
7373 set -x
7474- # Replace values begining with a '<' by the content of the file whose name is after.
7474+ # Replace values beginning with a '<' by the content of the file whose name is after.
7575 gawk '{ if (match($0,/^([^=]+=)<(.+)/,m)) { getline f < m[2]; print m[1] f } else print $0 }' ${configIni} |
7676 ${optionalString (!allowStripe) "gawk '!/^stripe-secret-key=/' |"}
7777 install -o ${srvCfg.user} -g root -m 400 /dev/stdin ${runDir}/config.ini
···145145 in lib.mdDoc ''
146146 Whether to enable the Taskwarrior server.
147147148148- More instructions about NixOS in conjuction with Taskserver can be
148148+ More instructions about NixOS in conjunction with Taskserver can be
149149 found [in the NixOS manual](${url}).
150150 '';
151151 };
···251251 client id (such as `task 2.3.0`).
252252253253 The values `all` or `none` have
254254- special meaning. Overidden by any entry in the option
254254+ special meaning. Overridden by any entry in the option
255255 {option}`services.taskserver.disallowedClientIDs`.
256256 '';
257257 };
+2-2
nixos/modules/services/monitoring/graphite.nix
···154154 };
155155156156 blacklist = mkOption {
157157- description = lib.mdDoc "Any metrics received which match one of the experssions will be dropped.";
157157+ description = lib.mdDoc "Any metrics received which match one of the expressions will be dropped.";
158158 default = null;
159159 type = types.nullOr types.str;
160160 example = "^some\\.noisy\\.metric\\.prefix\\..*";
161161 };
162162163163 whitelist = mkOption {
164164- description = lib.mdDoc "Only metrics received which match one of the experssions will be persisted.";
164164+ description = lib.mdDoc "Only metrics received which match one of the expressions will be persisted.";
165165 default = null;
166166 type = types.nullOr types.str;
167167 example = ".*";
···3737 by default</link>, via http under <literal>/metrics</literal>. In this
3838 example the firewall should just allow incoming connections to the
3939 exporter's port on the bridge interface <literal>br0</literal> (this would
4040- have to be configured seperately of course). For more information about
4040+ have to be configured separately of course). For more information about
4141 configuration see <literal>man configuration.nix</literal> or search through
4242 the
4343 <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
···179179 # for the exporter's systemd service. One of
180180 # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart`
181181 # has to be specified here. This will be merged with the default
182182- # service confiuration.
182182+ # service configuration.
183183 # Note that by default 'DynamicUser' is 'true'.
184184 serviceOpts = {
185185 serviceConfig = {
···1717 settings that can all be used here: https://github.com/martin-helmich/prometheus-nginxlog-exporter
18181919 The `listen` object is already generated by `port`, `listenAddress` and `metricsEndpoint` and
2020- will be merged with the value of `settings` before writting it as JSON.
2020+ will be merged with the value of `settings` before writing it as JSON.
2121 '';
2222 };
2323
+1-1
nixos/modules/services/monitoring/thanos.nix
···300300 max-time = mkParamDef types.str "9999-12-31T23:59:59Z" ''
301301 End of time range limit to serve.
302302303303- Thanos Store serves only blocks, which happened eariler than this
303303+ Thanos Store serves only blocks, which happened earlier than this
304304 value. Option can be a constant time in RFC3339 format or time duration
305305 relative to current time, such as -1d or 2h45m. Valid duration units are
306306 ms, s, m, h, d, w, y.
+2-2
nixos/modules/services/monitoring/ups.nix
···1212 upsOptions = {name, config, ...}:
1313 {
1414 options = {
1515- # This can be infered from the UPS model by looking at
1515+ # This can be inferred from the UPS model by looking at
1616 # /nix/store/nut/share/driver.list
1717 driver = mkOption {
1818 type = types.str;
···228228 "}
229229 '';
230230 "nut/upssched.conf".source = cfg.schedulerRules;
231231- # These file are containing private informations and thus should not
231231+ # These file are containing private information and thus should not
232232 # be stored inside the Nix store.
233233 /*
234234 "nut/upsd.conf".source = "";
···54545555 services.kubo = {
56565757- enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degredation)");
5757+ enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degradation)");
58585959 package = mkOption {
6060 type = types.package;
···2121 fileSystems = mkOption {
2222 description = lib.mdDoc ''
2323 The orangefs file systems to be mounted.
2424- This option is prefered over using {option}`fileSystems` directly since
2424+ This option is preferred over using {option}`fileSystems` directly since
2525 the pvfs client service needs to be running for it to be mounted.
2626 '';
2727
···209209 after = [ "network-online.target" ];
210210211211 serviceConfig = {
212212- # Run as "simple" in forground mode.
212212+ # Run as "simple" in foreground mode.
213213 # This is more reliable
214214 ExecStart = ''
215215 ${pkgs.orangefs}/bin/pvfs2-server -d \
+1-1
nixos/modules/services/networking/3proxy.nix
···158158 description = lib.mdDoc ''
159159 List of target IP ranges, use empty list for any.
160160 May also contain host names instead of addresses.
161161- It's possible to use wildmask in the begginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
161161+ It's possible to use wildmask in the beginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
162162 Hostname is only checked if hostname presents in request.
163163 '';
164164 };
+2-2
nixos/modules/services/networking/biboumi.nix
···4545 default = "/etc/ssl/certs/ca-certificates.crt";
4646 description = lib.mdDoc ''
4747 Specifies which file should be used as the list of trusted CA
4848- when negociating a TLS session.
4848+ when negotiating a TLS session.
4949 '';
5050 };
5151 options.db_name = mkOption {
···111111 description = lib.mdDoc ''
112112 A directory that should contain the policy files,
113113 used to customize Botan’s behaviour
114114- when negociating the TLS connections with the IRC servers.
114114+ when negotiating the TLS connections with the IRC servers.
115115 '';
116116 };
117117 options.port = mkOption {
+1-1
nixos/modules/services/networking/bitcoind.nix
···9595 }
9696 '';
9797 type = types.attrsOf (types.submodule rpcUserOpts);
9898- description = lib.mdDoc "RPC user information for JSON-RPC connnections.";
9898+ description = lib.mdDoc "RPC user information for JSON-RPC connections.";
9999 };
100100 };
101101
+1-1
nixos/modules/services/networking/bitlbee.nix
···6060 type = types.str;
6161 default = "127.0.0.1";
6262 description = lib.mdDoc ''
6363- The interface the BitlBee deamon will be listening to. If `127.0.0.1`,
6363+ The interface the BitlBee daemon will be listening to. If `127.0.0.1`,
6464 only clients on the local host can connect to it; if `0.0.0.0`, clients
6565 can access it from any network interface.
6666 '';
···3232 default = "[::]:4369";
3333 description = lib.mdDoc ''
3434 the listenStream used by the systemd socket.
3535- see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations.
3535+ see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more information.
3636 use this to change the port epmd will run on.
3737 if not defined, epmd will use "[::]:4369"
3838 '';
···268268 type = types.attrsOf types.str;
269269 default = { };
270270 description = lib.mdDoc ''
271271- Domain map is used to map incomming users (by their email) to
271271+ Domain map is used to map incoming users (by their email) to
272272 a namespace. The key can be a string, or regex.
273273 '';
274274 example = {
···326326 type = types.nullOr types.path;
327327 default = null;
328328 description = lib.mdDoc ''
329329- Path to a file containg ACL policies.
329329+ Path to a file containing ACL policies.
330330 '';
331331 };
332332
···9696 hardenService =
9797 # Add some common systemd service hardening settings,
9898 # but allow each service (here) to override
9999- # settings by explicitely setting those to `null`.
9999+ # settings by explicitly setting those to `null`.
100100 # More hardening would be nice but makes
101101 # customizing hylafax setups very difficult.
102102 # If at all, it should only be added along
+1-1
nixos/modules/services/networking/i2pd.nix
···473473 type = with types; nullOr str;
474474 default = null;
475475 description = lib.mdDoc ''
476476- Router Familiy to trust for first hops.
476476+ Router Family to trust for first hops.
477477 '';
478478 };
479479
+1-1
nixos/modules/services/networking/iperf3.nix
···77 port = mkOption {
88 type = types.ints.u16;
99 default = 5201;
1010- description = lib.mdDoc "Server port to listen on for iperf3 client requsts.";
1010+ description = lib.mdDoc "Server port to listen on for iperf3 client requests.";
1111 };
1212 affinity = mkOption {
1313 type = types.nullOr types.ints.unsigned;
+4-4
nixos/modules/services/networking/kea.nix
···4747 type = listOf str;
4848 default = [];
4949 description = lib.mdDoc ''
5050- List of additonal arguments to pass to the daemon.
5050+ List of additional arguments to pass to the daemon.
5151 '';
5252 };
5353···8686 type = listOf str;
8787 default = [];
8888 description = lib.mdDoc ''
8989- List of additonal arguments to pass to the daemon.
8989+ List of additional arguments to pass to the daemon.
9090 '';
9191 };
9292···146146 type = listOf str;
147147 default = [];
148148 description = lib.mdDoc ''
149149- List of additonal arguments to pass to the daemon.
149149+ List of additional arguments to pass to the daemon.
150150 '';
151151 };
152152···207207 type = listOf str;
208208 default = [];
209209 description = lib.mdDoc ''
210210- List of additonal arguments to pass to the daemon.
210210+ List of additional arguments to pass to the daemon.
211211 '';
212212 };
213213
+1-1
nixos/modules/services/networking/knot.nix
···4343 type = types.listOf types.str;
4444 default = [];
4545 description = lib.mdDoc ''
4646- List of additional command line paramters for knotd
4646+ List of additional command line parameters for knotd
4747 '';
4848 };
4949
+1-1
nixos/modules/services/networking/libreswan.nix
···106106 type = types.bool;
107107 default = true;
108108 description = lib.mdDoc ''
109109- Whether to disable send and accept redirects for all nework interfaces.
109109+ Whether to disable send and accept redirects for all network interfaces.
110110 See the Libreswan [
111111 FAQ](https://libreswan.org/wiki/FAQ#Why_is_it_recommended_to_disable_send_redirects_in_.2Fproc.2Fsys.2Fnet_.3F) page for why this is recommended.
112112 '';
···8787 };
8888 };
8989 })
9090- # this is seperate so it can be enabled on mirrored hosts
9090+ # this is separate so it can be enabled on mirrored hosts
9191 (mkIf (cfg.nginx.enable) {
9292 # https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf
9393 services.nginx.virtualHosts = {
+1-1
nixos/modules/services/networking/mosquitto.nix
···479479 Directories to be scanned for further config files to include.
480480 Directories will processed in the order given,
481481 `*.conf` files in the directory will be
482482- read in case-sensistive alphabetical order.
482482+ read in case-sensitive alphabetical order.
483483 '';
484484 default = [];
485485 };
+1-1
nixos/modules/services/networking/ncdns.nix
···8585 ```
8686 bit. IN NS ns1.example.com.
8787 ```
8888- If unset ncdns will generate an internal psuedo-hostname under the
8888+ If unset ncdns will generate an internal pseudo-hostname under the
8989 zone, which will resolve to the value of
9090 {option}`services.ncdns.identity.address`.
9191 If you are only using ncdns locally you can ignore this.
+2-2
nixos/modules/services/networking/ndppd.nix
···4343 timeout = mkOption {
4444 type = types.int;
4545 description = lib.mdDoc ''
4646- Controls how long to wait for a Neighbor Advertisment Message before
4646+ Controls how long to wait for a Neighbor Advertisement Message before
4747 invalidating the entry, in milliseconds.
4848 '';
4949 default = 500;
···7474 type = types.nullOr types.str;
7575 description = lib.mdDoc ''
7676 This is the target address is to match against. If no netmask
7777- is provided, /128 is assumed. The addresses of serveral rules
7777+ is provided, /128 is assumed. The addresses of several rules
7878 may or may not overlap.
7979 Defaults to the name of the attrset.
8080 '';
+1-1
nixos/modules/services/networking/nftables.nix
···3737 # Check out https://wiki.nftables.org/ for better documentation.
3838 # Table for both IPv4 and IPv6.
3939 table inet filter {
4040- # Block all incomming connections traffic except SSH and "ping".
4040+ # Block all incoming connections traffic except SSH and "ping".
4141 chain input {
4242 type filter hook input priority 0;
4343
+1-1
nixos/modules/services/networking/nsd.nix
···371371 default = null;
372372 example = "2000::1@1234";
373373 description = lib.mdDoc ''
374374- This address will be used for zone-transfere requests if configured
374374+ This address will be used for zone-transfer requests if configured
375375 as a secondary server or notifications in case of a primary server.
376376 Supply either a plain IPv4 or IPv6 address with an optional port
377377 number (ip@port).
+1-1
nixos/modules/services/networking/ostinato.nix
···5454 default = "0.0.0.0";
5555 description = lib.mdDoc ''
5656 By default, the Drone RPC server will listen on all interfaces and
5757- local IPv4 adresses for incoming connections from clients. Specify
5757+ local IPv4 addresses for incoming connections from clients. Specify
5858 a single IPv4 or IPv6 address if you want to restrict that.
5959 To listen on any IPv6 address, use ::
6060 '';
+1-1
nixos/modules/services/networking/pleroma.nix
···5252 the right place to store any secret
53535454 Have a look to Pleroma section in the NixOS manual for more
5555- informations.
5555+ information.
5656 '';
5757 };
5858
+4-4
nixos/modules/services/networking/prosody.nix
···309309 type = types.int;
310310 default = 300;
311311 description = lib.mdDoc ''
312312- Timout after which the room is destroyed or unlocked if not
312312+ Timeout after which the room is destroyed or unlocked if not
313313 configured, in seconds
314314 '';
315315 };
···489489490490 Setting this option to true will prevent you from building a
491491 NixOS configuration which won't comply with this standard.
492492- You can explicitely decide to ignore this standard if you
492492+ You can explicitly decide to ignore this standard if you
493493 know what you are doing by setting this option to false.
494494495495 [1] https://xmpp.org/extensions/xep-0423.html
···649649 extraPluginPaths = mkOption {
650650 type = types.listOf types.path;
651651 default = [];
652652- description = lib.mdDoc "Addtional path in which to look find plugins/modules";
652652+ description = lib.mdDoc "Additional path in which to look find plugins/modules";
653653 };
654654655655 uploadHttp = mkOption {
···733733734734 Having a server not XEP-0423-compliant might make your XMPP
735735 experience terrible. See the NixOS manual for further
736736- informations.
736736+ information.
737737738738 If you know what you're doing, you can disable this warning by
739739 setting config.services.prosody.xmppComplianceSuite to false.
+1-1
nixos/modules/services/networking/radicale.nix
···7777 <https://radicale.org/3.0.html#documentation/authentication-and-rights>.
7878 This option only works in conjunction with {option}`settings`.
7979 Setting this will also set {option}`settings.rights.type` and
8080- {option}`settings.rights.file` to approriate values.
8080+ {option}`settings.rights.file` to appropriate values.
8181 '';
8282 default = { };
8383 example = literalExpression ''
+2-2
nixos/modules/services/networking/searx.nix
···124124 description = lib.mdDoc ''
125125 Whether to run searx in uWSGI as a "vassal", instead of using its
126126 built-in HTTP server. This is the recommended mode for public or
127127- large instances, but is unecessary for LAN or local-only use.
127127+ large instances, but is unnecessary for LAN or local-only use.
128128129129 ::: {.warning}
130130 The built-in HTTP server logs all queries by default.
···223223 module = "searx.webapp";
224224 env = [
225225 "SEARX_SETTINGS_PATH=${cfg.settingsFile}"
226226- # searxng compatiblity https://github.com/searxng/searxng/issues/1519
226226+ # searxng compatibility https://github.com/searxng/searxng/issues/1519
227227 "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}"
228228 ];
229229 buffer-size = 32768;
+1-1
nixos/modules/services/networking/stunnel.nix
···78787979 servers = mkOption {
8080 description = lib.mdDoc ''
8181- Define the server configuations.
8181+ Define the server configurations.
82828383 See "SERVICE-LEVEL OPTIONS" in {manpage}`stunnel(8)`.
8484 '';
+1-1
nixos/modules/services/networking/unbound.nix
···245245 NotifyAccess = "main";
246246 Type = "notify";
247247248248- # FIXME: Which of these do we actualy need, can we drop the chroot flag?
248248+ # FIXME: Which of these do we actually need, can we drop the chroot flag?
249249 AmbientCapabilities = [
250250 "CAP_NET_BIND_SERVICE"
251251 "CAP_NET_RAW"
+1-1
nixos/modules/services/networking/unifi.nix
···7676 default = null;
7777 example = 4096;
7878 description = lib.mdDoc ''
7979- Set the maximimum heap size for the JVM in MB. If this option isn't set, the
7979+ Set the maximum heap size for the JVM in MB. If this option isn't set, the
8080 JVM will decide this value at runtime.
8181 '';
8282 };
+1-1
nixos/modules/services/networking/vsftpd.nix
···168168169169 The default is a file containing the users from {option}`userlist`.
170170171171- If explicitely set to null userlist_file will not be set in vsftpd's config file.
171171+ If explicitly set to null userlist_file will not be set in vsftpd's config file.
172172 '';
173173 };
174174
+1-1
nixos/modules/services/networking/wireguard.nix
···303303 set -e
304304305305 # If the parent dir does not already exist, create it.
306306- # Otherwise, does nothing, keeping existing permisions intact.
306306+ # Otherwise, does nothing, keeping existing permissions intact.
307307 mkdir -p --mode 0755 "${dirOf values.privateKeyFile}"
308308309309 if [ ! -f "${values.privateKeyFile}" ]; then
+2-2
nixos/modules/services/networking/yggdrasil.xml
···3030 settings = {
3131 Peers = [
3232 # Yggdrasil will automatically connect and "peer" with other nodes it
3333- # discovers via link-local multicast annoucements. Unless this is the
3333+ # discovers via link-local multicast announcements. Unless this is the
3434 # case (it probably isn't) a node needs peers within the existing
3535 # network that it can tunnel to.
3636 "tcp://1.2.3.4:1024"
···7878 }];
79798080 services.radvd = {
8181- # Annouce the 300::/8 prefix to eth0.
8181+ # Announce the 300::/8 prefix to eth0.
8282 enable = true;
8383 config = ''
8484 interface eth0
+1-1
nixos/modules/services/printing/ipp-usb.nix
···77 config = lib.mkIf config.services.ipp-usb.enable {
88 systemd.services.ipp-usb = {
99 description = "Daemon for IPP over USB printer support";
1010- after = [ "cups.service" "avahi-deamon.service" ];
1010+ after = [ "cups.service" "avahi-daemon.service" ];
1111 wants = [ "avahi-daemon.service" ];
1212 serviceConfig = {
1313 ExecStart = [ "${pkgs.ipp-usb}/bin/ipp-usb" ];
+2-2
nixos/modules/services/security/fail2ban.nix
···161161 type = types.str;
162162 example = "2 4 16 128";
163163 description = lib.mdDoc ''
164164- "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, coresponding
164164+ "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, corresponding
165165 previously ban count and given "bantime.factor" (for multipliers default is 1);
166166 following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count,
167167 always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours
···174174 example = true;
175175 description = lib.mdDoc ''
176176 "bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed
177177- cross over all jails, if false (dafault), only current jail of the ban IP will be searched
177177+ cross over all jails, if false (default), only current jail of the ban IP will be searched
178178 '';
179179 };
180180
+2-2
nixos/modules/services/security/shibboleth-sp.nix
···2727 fastcgi.shibAuthorizerPort = mkOption {
2828 type = types.int;
2929 default = 9100;
3030- description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to";
3030+ description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to";
3131 };
32323333 fastcgi.shibResponderPort = mkOption {
3434 type = types.int;
3535 default = 9101;
3636- description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to";
3636+ description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to";
3737 };
3838 };
3939 };
···118118 description = lib.mdDoc ''
119119 The USBGuard daemon modifies some attributes of controller
120120 devices like the default authorization state of new child device
121121- instances. Using this setting, you can controll whether the daemon
121121+ instances. Using this setting, you can control whether the daemon
122122 will try to restore the attribute values to the state before
123123- modificaton on shutdown.
123123+ modification on shutdown.
124124 '';
125125 };
126126
+1-1
nixos/modules/services/system/cloud-init.nix
···27272828 This configuration is not completely compatible with the
2929 NixOS way of doing configuration, as configuration done by
3030- cloud-init might be overriden by a subsequent nixos-rebuild
3030+ cloud-init might be overridden by a subsequent nixos-rebuild
3131 call. However, some parts of cloud-init fall outside of
3232 NixOS's responsibility, like filesystem resizing and ssh
3333 public key provisioning, and cloud-init is useful for that
···6666 `true`. String values must be quoted, integer and
6767 boolean values must not. See
6868 <https://git.deluge-torrent.org/deluge/tree/deluge/core/preferencesmanager.py#n41>
6969- for the availaible options.
6969+ for the available options.
7070 '';
7171 };
7272···117117 when {option}`services.deluge.declarative` is set to
118118 `true`.
119119 See <https://dev.deluge-torrent.org/wiki/UserGuide/Authentication> for
120120- more informations.
120120+ more information.
121121 '';
122122 };
123123
+1-1
nixos/modules/services/torrent/magnetico.nix
···143143 The path to the file holding the credentials to access the web
144144 interface. If unset no authentication will be required.
145145146146- The file must constain user names and password hashes in the format
146146+ The file must contain user names and password hashes in the format
147147 `username:hash `, one for each line. Usernames must
148148 start with a lowecase ([a-z]) ASCII character, might contain
149149 non-consecutive underscores except at the end, and consists of
+1-1
nixos/modules/services/torrent/rtorrent.nix
···8282 type = types.lines;
8383 default = "";
8484 description = lib.mdDoc ''
8585- The content of {file}`rtorrent.rc`. The [modernized configuration template](https://rtorrent-docs.readthedocs.io/en/latest/cookbook.html#modernized-configuration-template) with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completly.
8585+ The content of {file}`rtorrent.rc`. The [modernized configuration template](https://rtorrent-docs.readthedocs.io/en/latest/cookbook.html#modernized-configuration-template) with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completely.
8686 '';
8787 };
8888 };
+2-2
nixos/modules/services/torrent/transmission.nix
···4444 (each time the service starts).
45454646 See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files)
4747- for documentation of settings not explicitely covered by this module.
4747+ for documentation of settings not explicitly covered by this module.
4848 '';
4949 default = {};
5050 type = types.submodule {
···355355 PrivateUsers = true;
356356 ProtectClock = true;
357357 ProtectControlGroups = true;
358358- # ProtectHome=true would not allow BindPaths= to work accross /home,
358358+ # ProtectHome=true would not allow BindPaths= to work across /home,
359359 # and ProtectHome=tmpfs would break statfs(),
360360 # preventing transmission-daemon to report the available free space.
361361 # However, RootDirectory= is used, so this is not a security concern
+1-1
nixos/modules/services/video/unifi-video.nix
···159159 default = 1024;
160160 example = 4096;
161161 description = lib.mdDoc ''
162162- Set the maximimum heap size for the JVM in MB.
162162+ Set the maximum heap size for the JVM in MB.
163163 '';
164164 };
165165
+1-1
nixos/modules/services/web-apps/bookstack.nix
···359359 };
360360361361 systemd.services.bookstack-setup = {
362362- description = "Preperation tasks for BookStack";
362362+ description = "Preparation tasks for BookStack";
363363 before = [ "phpfpm-bookstack.service" ];
364364 after = optional db.createLocally "mysql.service";
365365 wantedBy = [ "multi-user.target" ];
+1-1
nixos/modules/services/web-apps/healthchecks.nix
···9898 description = lib.mdDoc ''
9999 Environment variables which are read by healthchecks `(local)_settings.py`.
100100101101- Settings which are explictly covered in options bewlow, are type-checked and/or transformed
101101+ Settings which are explicitly covered in options bewlow, are type-checked and/or transformed
102102 before added to the environment, everything else is passed as a string.
103103104104 See <https://healthchecks.io/docs/self_hosted_configuration/>
···6868 example = {
6969 http = ":8000";
7070 };
7171- description = lib.mdDoc "Additionnal configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen.";
7171+ description = lib.mdDoc "Additional configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen.";
7272 };
7373 defaultSender = {
7474 name = mkOption {
+1-1
nixos/modules/services/web-apps/invidious.nix
···171171 description = lib.mdDoc ''
172172 A file including Invidious settings.
173173174174- It gets merged with the setttings specified in {option}`services.invidious.settings`
174174+ It gets merged with the settings specified in {option}`services.invidious.settings`
175175 and can be used to store secrets like `hmac_key` outside of the nix store.
176176 '';
177177 };
+1-1
nixos/modules/services/web-apps/invoiceplane.nix
···7474 type = types.path;
7575 default = "/var/lib/invoiceplane/${name}";
7676 description = lib.mdDoc ''
7777- This directory is used for uploads of attachements and cache.
7777+ This directory is used for uploads of attachments and cache.
7878 The directory passed here is automatically created and permissions
7979 adjusted as required.
8080 '';
+1-1
nixos/modules/services/web-apps/jitsi-meet.nix
···2828 '');
29293030 # Essential config - it's probably not good to have these as option default because
3131- # types.attrs doesn't do merging. Let's merge explicitly, can still be overriden if
3131+ # types.attrs doesn't do merging. Let's merge explicitly, can still be overridden if
3232 # user desires.
3333 defaultCfg = {
3434 hosts = {
+1-1
nixos/modules/services/web-apps/matomo.nix
···174174 CURRENT_PACKAGE=$(readlink ${dataDir}/current-package)
175175 NEW_PACKAGE=${cfg.package}
176176 if [ "$CURRENT_PACKAGE" != "$NEW_PACKAGE" ]; then
177177- # keeping tmp arround between upgrades seems to bork stuff, so delete it
177177+ # keeping tmp around between upgrades seems to bork stuff, so delete it
178178 rm -rf ${dataDir}/tmp
179179 fi
180180 elif [ -e ${dataDir}/tmp ]; then
+1-1
nixos/modules/services/web-apps/mattermost.nix
···170170 type = types.attrs;
171171 default = { };
172172 description = lib.mdDoc ''
173173- Addtional configuration options as Nix attribute set in config.json schema.
173173+ Additional configuration options as Nix attribute set in config.json schema.
174174 '';
175175 };
176176
+1-1
nixos/modules/services/web-apps/mediawiki.nix
···129129130130 ## Set $wgCacheDirectory to a writable directory on the web server
131131 ## to make your wiki go slightly faster. The directory should not
132132- ## be publically accessible from the web.
132132+ ## be publicly accessible from the web.
133133 $wgCacheDirectory = "${cacheDir}";
134134135135 # Site language code, should be one of the list in ./languages/data/Names.php
+1-1
nixos/modules/services/web-apps/netbox.nix
···135135 type = types.path;
136136 default = "";
137137 description = lib.mdDoc ''
138138- Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`.
138138+ Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.
139139 See the [documentation](https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration) for possible options.
140140 '';
141141 };
+7-7
nixos/modules/services/web-apps/nextcloud.nix
···1616 # disable default openssl extension
1717 (lib.filter (e: e.pname != "php-openssl") enabled)
1818 # use OpenSSL 1.1 for RC4 Nextcloud encryption if user
1919- # has acknowledged the brokeness of the ciphers (RC4).
1919+ # has acknowledged the brokenness of the ciphers (RC4).
2020 # TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed.
2121 ++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ])
2222 ++ optional cfg.enableImagemagick imagick
···7676 * setting `listen.owner` & `listen.group` in the phpfpm-pool to a different value
77777878 Further details about this can be found in the `Nextcloud`-section of the NixOS-manual
7979- (which can be openend e.g. by running `nixos-help`).
7979+ (which can be opened e.g. by running `nixos-help`).
8080 '')
8181 (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
8282 Use services.nextcloud.nginx.enableImagemagick instead.
···388388 default = [];
389389 description = lib.mdDoc ''
390390 Trusted domains, from which the nextcloud installation will be
391391- acessible. You don't need to add
391391+ accessible. You don't need to add
392392 `services.nextcloud.hostname` here.
393393 '';
394394 };
···698698699699 services.nextcloud.enableBrokenCiphersForSSE = false;
700700701701- If you need to use server-side encryption you can ignore this waring.
701701+ If you need to use server-side encryption you can ignore this warning.
702702 Otherwise you'd have to disable server-side encryption first in order
703703 to be able to safely disable this option and get rid of this warning.
704704 See <https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption> on how to achieve this.
···758758759759 nextcloud-setup = let
760760 c = cfg.config;
761761- writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
761761+ writePhpArray = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
762762 requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable;
763763 objectstoreConfig = let s3 = c.objectstore.s3; in optionalString s3.enable ''
764764 'objectstore' => [
···838838 ''
839839 }
840840 'dbtype' => '${c.dbtype}',
841841- 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
842842- 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
841841+ 'trusted_domains' => ${writePhpArray ([ cfg.hostName ] ++ c.extraTrustedDomains)},
842842+ 'trusted_proxies' => ${writePhpArray (c.trustedProxies)},
843843 ${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
844844 ${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"}
845845 ${objectstoreConfig}
+1-1
nixos/modules/services/web-apps/nextcloud.xml
···283283284284 <para>
285285 If major-releases will be abandoned by upstream, we should check first if those are needed
286286- in NixOS for a safe upgrade-path before removing those. In that case we shold keep those
286286+ in NixOS for a safe upgrade-path before removing those. In that case we should keep those
287287 packages, but mark them as insecure in an expression like this (in
288288 <literal><nixpkgs/pkgs/servers/nextcloud/default.nix></literal>):
289289<programlisting>/* ... */
+1-1
nixos/modules/services/web-apps/onlyoffice.nix
···5454 postgresName = mkOption {
5555 type = types.str;
5656 default = "onlyoffice";
5757- description = lib.mdDoc "The name of databse OnlyOffice should user.";
5757+ description = lib.mdDoc "The name of database OnlyOffice should user.";
5858 };
59596060 postgresPasswordFile = mkOption {
+1-1
nixos/modules/services/web-apps/outline.nix
···465465 options = {
466466 host = lib.mkOption {
467467 type = lib.types.str;
468468- description = lib.mdDoc "Host name or IP adress of the SMTP server.";
468468+ description = lib.mdDoc "Host name or IP address of the SMTP server.";
469469 };
470470 port = lib.mkOption {
471471 type = lib.types.port;
···130130 ldapConfigPath = mkOption {
131131 type = types.path;
132132 description = lib.mdDoc ''
133133- Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`.
133133+ Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.
134134 See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options.
135135 '';
136136 };
···4141 defaultText = literalExpression "head config.${sksOpt.hkpAddress}";
4242 type = types.str;
4343 description = lib.mdDoc ''
4444- Wich ip address the sks-keyserver is listening on.
4444+ Which IP address the sks-keyserver is listening on.
4545 '';
4646 };
4747
+1-1
nixos/modules/services/web-apps/snipe-it.nix
···381381 };
382382383383 systemd.services.snipe-it-setup = {
384384- description = "Preperation tasks for snipe-it";
384384+ description = "Preparation tasks for snipe-it";
385385 before = [ "phpfpm-snipe-it.service" ];
386386 after = optional db.createLocally "mysql.service";
387387 wantedBy = [ "multi-user.target" ];
+1-1
nixos/modules/services/web-apps/sogo.nix
···4949 Replacement-filepath mapping for sogo.conf.
5050 Every key is replaced with the contents of the file specified as value.
51515252- In the example, every occurence of LDAP_BINDPW will be replaced with the text of the
5252+ In the example, every occurrence of LDAP_BINDPW will be replaced with the text of the
5353 specified file.
5454 '';
5555 type = attrsOf str;
+1-1
nixos/modules/services/web-apps/wiki-js.nix
···1717 default = null;
1818 example = "/root/wiki-js.env";
1919 description = lib.mdDoc ''
2020- Environment fiel to inject e.g. secrets into the configuration.
2020+ Environment file to inject e.g. secrets into the configuration.
2121 '';
2222 };
2323
+1-1
nixos/modules/services/web-servers/agate.nix
···4343 type = types.listOf types.str;
4444 description = lib.mdDoc ''
4545 Domain name of this Gemini server, enables checking hostname and port
4646- in requests. (multiple occurences means basic vhosts)
4646+ in requests. (multiple occurrences means basic vhosts)
4747 '';
4848 };
4949
···61616262 description = lib.mdDoc ''
6363 Listen addresses for this virtual host.
6464- Compared to `listen` this only sets the addreses
6464+ Compared to `listen` this only sets the addresses
6565 and the ports are chosen automatically.
6666 '';
6767 default = [ "*" ];
···140140141141 # On deploy this will load our app, by moving it into the incoming dir
142142 # If the bundle content changes, this will run again.
143143- # Because the bundle content contains the nix path to the exectuable,
143143+ # Because the bundle content contains the nix path to the executable,
144144 # we inherit nix based cache busting.
145145 systemd.services.load-keter-bundle = {
146146 description = "load keter bundle into incoming folder";
···54545555 description = lib.mdDoc ''
5656 Listen addresses for this virtual host.
5757- Compared to `listen` this only sets the addreses
5858- and the ports are choosen automatically.
5757+ Compared to `listen` this only sets the addresses
5858+ and the ports are chosen automatically.
59596060 Note: This option overrides `enableIPv6`
6161 '';
+1-1
nixos/modules/services/web-servers/ttyd.nix
···163163 assertions =
164164 [ { assertion = cfg.enableSSL
165165 -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null;
166166- message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specefied."; }
166166+ message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; }
167167 { assertion = ! (cfg.interface != null && cfg.socket != null);
168168 message = "Cannot set both interface and socket for ttyd."; }
169169 { assertion = (cfg.username != null) == (cfg.passwordFile != null);
+1-1
nixos/modules/services/web-servers/zope2.nix
···9595 };
9696 }
9797 '';
9898- description = lib.mdDoc "zope2 instances to be created automaticaly by the system.";
9898+ description = lib.mdDoc "zope2 instances to be created automatically by the system.";
9999 };
100100 };
101101
···123123 };
124124 };
125125 description = lib.mdDoc ''
126126- Extra settings merged in and overwritting defaults in sddm.conf.
126126+ Extra settings merged in and overwriting defaults in sddm.conf.
127127 '';
128128 };
129129
+1-1
nixos/modules/services/x11/hardware/libinput.nix
···171171 lib.mdDoc ''
172172 Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap-
173173 and-drag will not immediately release the button. If the finger is set down again within the
174174- timeout, the draging process continues.
174174+ timeout, the dragging process continues.
175175 '';
176176 };
177177
+2-2
nixos/modules/services/x11/imwheel.nix
···3737 Window class translation rules.
3838 /etc/X11/imwheelrc is generated based on this config
3939 which means this config is global for all users.
4040- See [offical man pages](http://imwheel.sourceforge.net/imwheel.1.html)
4141- for more informations.
4040+ See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html)
4141+ for more information.
4242 '';
4343 };
4444 };
+1-1
nixos/modules/services/x11/xautolock.nix
···7171 type = types.nullOr types.str;
72727373 description = lib.mdDoc ''
7474- The script to use when nothing has happend for as long as {option}`killtime`
7474+ The script to use when nothing has happened for as long as {option}`killtime`
7575 '';
7676 };
7777
+1-1
nixos/modules/virtualisation/appvm.nix
···2020 user = mkOption {
2121 type = types.str;
2222 description = lib.mdDoc ''
2323- AppVM user login. Currenly only AppVMs are supported for a single user only.
2323+ AppVM user login. Currently only AppVMs are supported for a single user only.
2424 '';
2525 };
2626 };
+1-1
nixos/modules/virtualisation/proxmox-image.nix
···2828 default = "local-lvm:vm-9999-disk-0";
2929 example = "ceph:vm-123-disk-0";
3030 description = lib.mdDoc ''
3131- Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target sotrage.
3131+ Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target storage.
3232 This parameter is required by PVE even if it isn't used.
3333 '';
3434 };
···277277 };
278278 };
279279280280- # Test compatiblity with Caddy
280280+ # Test compatibility with Caddy
281281 # It only supports useACMEHost, hence not using mkServerConfigs
282282 } // (let
283283 baseCaddyConfig = { nodes, config, ... }: {
+1-1
nixos/tests/cockroachdb.nix
···88# Cluster joins that are outside this window will fail, and nodes that skew
99# outside the window after joining will promptly get kicked out.
1010#
1111-# To accomodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
1111+# To accommodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
1212# driver inside a guest. This driver allows the host machine to pass its clock
1313# through to the guest as a hardware clock that appears as a Precision Time
1414# Protocol (PTP) Clock device, generally /dev/ptp0. PTP devices can be measured
+1-1
nixos/tests/common/ec2.nix
···4646 # Note: we use net=169.0.0.0/8 rather than
4747 # net=169.254.0.0/16 to prevent dhcpcd from getting horribly
4848 # confused. (It would get a DHCP lease in the 169.254.*
4949- # range, which it would then configure and prompty delete
4949+ # range, which it would then configure and promptly delete
5050 # again when it deletes link-local addresses.) Ideally we'd
5151 # turn off the DHCP server, but qemu does not have an option
5252 # to do that.
+1-1
nixos/tests/graphite.nix
···1313 '';
1414 };
1515 carbon.enableCache = true;
1616- seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure
1616+ seyren.enable = false; # Implicitly requires openssl-1.0.2u which is marked insecure
1717 };
1818 };
1919 };
+1-1
nixos/tests/home-assistant.nix
···120120 start_all()
121121122122 # Parse the package path out of the systemd unit, as we cannot
123123- # access the final package, that is overriden inside the module,
123123+ # access the final package, that is overridden inside the module,
124124 # by any other means.
125125 pattern = re.compile(r"path=(?P<path>[\/a-z0-9-.]+)\/bin\/hass")
126126 response = hass.execute("systemctl show -p ExecStart home-assistant.service")[1]
+1-1
nixos/tests/networking-proxy.nix
···3737 default-config //
3838 {
3939 networking.proxy = {
4040- # useless because overriden by the next options
4040+ # useless because overridden by the next options
4141 default = "http://user:pass@host:port";
4242 # advanced proxy setup
4343 httpProxy = "123-http://user:pass@http-host:port";
+1-1
nixos/tests/pgadmin4-standalone.nix
···11import ./make-test-python.nix ({ pkgs, lib, ... }:
22- # This is seperate from pgadmin4 since we don't want both running at once
22+ # This is separate from pgadmin4 since we don't want both running at once
3344 {
55 name = "pgadmin4-standalone";
+1-1
nixos/tests/pgadmin4.nix
···106106 && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
107107 )
108108109109- # Don't bother to test LDAP or kerberos authentification
109109+ # Don't bother to test LDAP or kerberos authentication
110110 with subtest("run browser test"):
111111 machine.succeed(
112112 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+1-1
nixos/tests/vaultwarden.nix
···164164 with subtest("configure the cli"):
165165 client.succeed("bw --nointeraction config server http://server")
166166167167- with subtest("can't login to nonexistant account"):
167167+ with subtest("can't login to nonexistent account"):
168168 client.fail(
169169 "bw --nointeraction --raw login ${userEmail} ${userPassword}"
170170 )
+1-1
pkgs/applications/audio/mp3val/default.nix
···2424 files' integrity. It can be useful for finding corrupted files (e.g.
2525 incompletely downloaded, truncated, containing garbage). MP3val is
2626 also able to fix most of the problems. Being a multiplatform application,
2727- MP3val can be runned both under Windows and under Linux (or BSD). The most
2727+ MP3val can be run both under Windows and under Linux (or BSD). The most
2828 common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports
2929 also other MPEG versions and layers. The tool is also aware of the most
3030 common types of tags (ID3v1, ID3v2, APEv2).
···11# Deprecated aliases - for backward compatibility
2233-lib: overriden:
33+lib: overridden:
4455-with overriden;
55+with overridden;
6677let
88 # Removing recurseForDerivation prevents derivations of aliased attribute
···21212222 # Make sure that we are not shadowing something from
2323 # all-packages.nix.
2424- checkInPkgs = n: alias: if builtins.hasAttr n overriden
2424+ checkInPkgs = n: alias: if builtins.hasAttr n overridden
2525 then throw "Alias ${n} is still in kakounePlugins"
2626 else alias;
2727
···45454646 sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX"
4747 sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
4848- echo " succesfully updated $attribute. new hash: $newHash"
4848+ echo " successfully updated $attribute. new hash: $newHash"
4949}
50505151updateCompatibilityList() {
···7272 sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX"
7373 sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
7474 sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX"
7575- echo " succesfully updated compatibility_list. new hash: $newHash"
7575+ echo " successfully updated compatibility_list. new hash: $newHash"
7676}
77777878if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then
+1-1
pkgs/applications/misc/with-shell/default.nix
···35353636 $ with git
3737 git> add .
3838- git> commit -a -m "Commited"
3838+ git> commit -a -m "Committed"
3939 git> push
40404141 Can also be used for compound commands.
···133133 };
134134 jdk = jdk8_headless;
135135 # not using native libs because of broken openssl_1_0_2 dependency
136136- # can be manually overriden
136136+ # can be manually overridden
137137 tests = nixosTests.hadoop_3_2;
138138 };
139139 hadoop2 = common rec {
···1212, gsettings-desktop-schemas
1313, glib
1414, gobject-introspection
1515-# Available plugins (can be overriden)
1515+# Available plugins (can be overridden)
1616, availablePlugins
1717# Used in the withPlugins interface at passthru, can be overrided directly, or
1818# prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])`
+1-1
pkgs/applications/radio/gnuradio/3.8.nix
···250250 })
251251 ];
252252 passthru = shared.passthru // {
253253- # Deps that are potentially overriden and are used inside GR plugins - the same version must
253253+ # Deps that are potentially overridden and are used inside GR plugins - the same version must
254254 inherit
255255 boost
256256 volk
+1-1
pkgs/applications/radio/gnuradio/3.9.nix
···280280 ./modtool-newmod-permissions.patch
281281 ];
282282 passthru = shared.passthru // {
283283- # Deps that are potentially overriden and are used inside GR plugins - the same version must
283283+ # Deps that are potentially overridden and are used inside GR plugins - the same version must
284284 inherit
285285 boost
286286 volk
+1-1
pkgs/applications/radio/gnuradio/default.nix
···299299 ./modtool-newmod-permissions.patch
300300 ];
301301 passthru = shared.passthru // {
302302- # Deps that are potentially overriden and are used inside GR plugins - the same version must
302302+ # Deps that are potentially overridden and are used inside GR plugins - the same version must
303303 inherit
304304 boost
305305 volk
+1-1
pkgs/applications/radio/gnuradio/shared.nix
···77, features
88, versionAttr
99, sourceSha256
1010-# If overriden. No need to set default values, as they are given defaults in
1010+# If overridden. No need to set default values, as they are given defaults in
1111# the main expressions
1212, overrideSrc
1313, fetchFromGitHub
···11{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8,
22- # The JDK we use on Darwin currenly makes extensive use of rpaths which are
22+ # The JDK we use on Darwin currently makes extensive use of rpaths which are
33 # annoying and break the python library, so let's not bother for now
44 includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }:
55
+1-1
pkgs/applications/science/math/LiE/default.nix
···1515 longDescription = ''
1616 LiE is a computer algebra system that is specialised in computations
1717 involving (reductive) Lie groups and their representations. It is
1818- publically available for free in source code. For a description of its
1818+ publicly available for free in source code. For a description of its
1919 characteristics, we refer to the following sources of information.
2020 ''; # take from the website
2121
···3535 for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done
3636 '';
37373838- # Must do manual build due to LAMMPS requiring a seperate build for
3838+ # Must do manual build due to LAMMPS requiring a separate build for
3939 # the libraries and executable. Also non-typical make script
4040 buildPhase = ''
4141 make mode=exe ${if withMPI then "mpi" else "serial"} SHELL=$SHELL LMP_INC="${lammps_includes}" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+1-1
pkgs/applications/video/epgstation/update.nix
···3939 # Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x
4040 ${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json
41414242- # Regenerate node packages to update the pre-overriden epgstation derivation.
4242+ # Regenerate node packages to update the pre-overridden epgstation derivation.
4343 # This must come *after* package.json has been regenerated.
4444 pushd ../../../development/node-packages
4545 ./generate.sh
+1-1
pkgs/applications/video/kodi/unwrapped.nix
···3434, buildPackages
3535}:
36363737-assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
3737+assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is available
3838assert gbmSupport || waylandSupport || x11Support;
39394040let
···7070 python3.pkgs.pytestCheckHook
7171 ];
72727373- # make the package's module avalaible
7373+ # make the package's module available
7474 preCheck = ''
7575 export PYTHONPATH="$PYTHONPATH:../python"
7676 '';
+1-1
pkgs/build-support/docker/default.nix
···879879 contentsList = if builtins.isList contents then contents else [ contents ];
880880881881 # We store the customisation layer as a tarball, to make sure that
882882- # things like permissions set on 'extraCommands' are not overriden
882882+ # things like permissions set on 'extraCommands' are not overridden
883883 # by Nix. Then we precompute the sha256 for performance.
884884 customisationLayer = symlinkJoin {
885885 name = "${baseName}-customisation-layer";
···111111 deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps;
112112 };
113113114114- # this contains all the nuget packages that are implictly referenced by the dotnet
114114+ # this contains all the nuget packages that are implicitly referenced by the dotnet
115115 # build system. having them as separate deps allows us to avoid having to regenerate
116116 # a packages dependencies when the dotnet-sdk version changes
117117 sdkDeps = mkNugetDeps {
···17171818stdenv.mkDerivation (
19192020- # First, attributes that can be overriden by the caller (via args):
2020+ # First, attributes that can be overridden by the caller (via args):
2121 {
2222 # By default, only configure and build a source distribution.
2323 # Some packages can only build a distribution after a general
···576576 expectedFiles = [
577577 "./bin/test_binary1"
578578 ] ++ lib.optionals stdenv.isDarwin [
579579- # On Darwin, the debug symbols are in a seperate directory.
579579+ # On Darwin, the debug symbols are in a separate directory.
580580 "./bin/test_binary1.dSYM/Contents/Info.plist"
581581 "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
582582 ];
···29312931 /* Returns a crate which depends on successful test execution
29322932 of crate given as the second argument.
2933293329342934- testCrateFlags: list of flags to pass to the test exectuable
29342934+ testCrateFlags: list of flags to pass to the test executable
29352935 testInputs: list of packages that should be available during test execution
29362936 */
29372937 crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
+1-1
pkgs/build-support/vm/default.nix
···11561156 of the default image parameters can be given. In particular,
11571157 `extraPackages' specifies the names of additional packages from
11581158 the distribution that should be included in the image; `packages'
11591159- allows the entire set of packages to be overriden; and `size'
11591159+ allows the entire set of packages to be overridden; and `size'
11601160 sets the size of the disk in megabytes. E.g.,
11611161 `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"];
11621162 size = 8192; }' builds an 8 GiB image containing Firefox in
+1-1
pkgs/data/fonts/google-fonts/default.nix
···88 pname = "google-fonts";
99 version = "unstable-2022-11-14";
10101111- # Adobe Blank is split out in a seperate output,
1111+ # Adobe Blank is split out in a separate output,
1212 # because it causes crashes with `libfontconfig`.
1313 # It has an absurd number of symbols
1414 outputs = [ "out" "adobeBlank" ];
+1-1
pkgs/data/fonts/profont/default.nix
···55 version = "2019-11";
6677 # Note: stripRoot doesn't work because the archive
88- # constains the metadata directory `__MACOSX`.
88+ # contains the metadata directory `__MACOSX`.
99 src = fetchzip {
1010 url = "https://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
1111 sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb";
+1-1
pkgs/data/fonts/tamzen/default.nix
···2222 meta = with lib; {
2323 description = "Bitmapped programming font based on Tamsyn";
2424 longDescription = ''
2525- Tamzen is a monospace bitmap font. It is programatically forked
2525+ Tamzen is a monospace bitmap font. It is programmatically forked
2626 from Tamsyn version 1.11, which backports glyphs from older
2727 versions while deleting deliberately empty glyphs to allow
2828 secondary/fallback fonts to provide real glyphs at those codepoints.
+1-1
pkgs/data/misc/cacert/update.sh
···11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p nix common-updater-scripts jq
3344-# Build both the cacert package and an overriden version where we use the source attribute of NSS.
44+# Build both the cacert package and an overridden version where we use the source attribute of NSS.
55# Cacert and NSS are both from the same upstream sources. They are decoupled as
66# the cacert output only cares about a few infrequently changing files in the
77# sources while the NSS source code changes frequently.
+1-1
pkgs/desktops/enlightenment/efl/default.nix
···147147 mesonFlags = [
148148 "--buildtype=release"
149149 "-D build-tests=false" # disable build tests, which are not working
150150- "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs
150150+ "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not available in nixpkgs
151151 "-D embedded-lz4=false"
152152 "-D fb=true"
153153 "-D network-backend=connman"
···2828 # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems.
2929 #
3030 # That is not possible within nixos, but we can achieve this easily with a simple script that copies
3131- # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session
3131+ # them. We then use a xdg autostart and initialize it during the "EarlyInitialization" phase of a gnome session
3232 # which is most appropriate for installing files into $HOME.
3333 #
3434
+2-2
pkgs/development/compilers/dotnet/update.sh
···9191 # would fail due to missing dependencies.
9292 #
9393 # Moving them to a separate list stored alongside the SDK package definitions,
9494- # and implictly including them along in buildDotnetModule allows us
9494+ # and implicitly including them along in buildDotnetModule allows us
9595 # to make updating .NET SDK packages a lot easier - we now just update
9696 # the versions of these packages in one place, and all packages that
9797 # use buildDotnetModule continue building with the new .NET version without changes.
···141141 # would fail due to missing dependencies.
142142 #
143143 # Moving them to a separate list stored alongside the SDK package definitions,
144144- # and implictly including them along in buildDotnetModule allows us
144144+ # and implicitly including them along in buildDotnetModule allows us
145145 # to make updating .NET SDK packages a lot easier - we now just update
146146 # the versions of these packages in one place, and all packages that
147147 # use buildDotnetModule continue building with the new .NET version without changes.
+1-1
pkgs/development/compilers/elm/default.nix
···2233let
4455- # To controll nodejs version we pass down
55+ # To control nodejs version we pass down
66 nodejs = pkgs.nodejs-14_x;
7788 fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
+1-1
pkgs/development/compilers/gcc/4.9/default.nix
···147147148148 hardeningDisable = [ "format" "pie" ];
149149150150- # When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as
150150+ # When targeting darwin, libgcc_ext.10.{4,5}.dylib are created as
151151 # MH_DYLIB_STUB files, which install_name_tool can't change, so we
152152 # get a cycle between $out and $lib.
153153 outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"]
···1616 # };
1717 # }
1818 config
1919- # GraalVM version that will be used unless overriden by `config.<platform>.version`
1919+ # GraalVM version that will be used unless overridden by `config.<platform>.version`
2020, defaultVersion
2121 # Java version used by GraalVM
2222, javaVersion
+1-1
pkgs/development/haskell-modules/lib/compose.nix
···355355 */
356356 triggerRebuild = i: overrideCabal (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
357357358358- /* Override the sources for the package and optionaly the version.
358358+ /* Override the sources for the package and optionally the version.
359359 This also takes of removing editedCabalFile.
360360 */
361361 overrideSrc = { src, version ? null }: drv:
+1-1
pkgs/development/haskell-modules/lib/default.nix
···279279 */
280280 triggerRebuild = drv: i: compose.triggerRebuild i drv;
281281282282- /* Override the sources for the package and optionaly the version.
282282+ /* Override the sources for the package and optionally the version.
283283 This also takes of removing editedCabalFile.
284284 */
285285 overrideSrc = drv: src: compose.overrideSrc src drv;
···3333 # `self` as second, and returns a set of haskell packages
3434 package-set
35353636-, # The final, fully overriden package set usable with the nixpkgs fixpoint
3636+, # The final, fully overridden package set usable with the nixpkgs fixpoint
3737 # overriding functionality
3838 extensible-self
3939}:
···73737474 mkDerivation = makeOverridable mkDerivationImpl;
75757676- # manualArgs are the arguments that were explictly passed to `callPackage`, like:
7676+ # manualArgs are the arguments that were explicitly passed to `callPackage`, like:
7777 #
7878 # callPackage foo { bar = null; };
7979 #
···2929, blas, lapack
3030# These two should use the same lapack and blas as the above
3131, qrupdate, arpack, suitesparse ? null
3232-# If set to true, the above 5 deps are overriden to use the blas and lapack
3232+# If set to true, the above 5 deps are overridden to use the blas and lapack
3333# with 64 bit indexes support. If all are not compatible, the build will fail.
3434, use64BitIdx ? false
3535, libwebp
···8282 ;
8383 qrupdate' = qrupdate.override {
8484 # If use64BitIdx is false, this override doesn't evaluate to a new
8585- # derivation, as blas and lapack are not overriden.
8585+ # derivation, as blas and lapack are not overridden.
8686 blas = blas';
8787 lapack = lapack';
8888 };
···12121313 namePrefix = python.libPrefix + "-";
14141515- # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.
1515+ # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`.
1616 # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`.
1717 makeOverridablePythonPackage = f: origArgs:
1818 let
···248248}
249249250250def _determine_fetcher(text):
251251- # Count occurences of fetchers.
251251+ # Count occurrences of fetchers.
252252 nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
253253 if nfetchers == 0:
254254 raise ValueError("no fetcher.")
+1-1
pkgs/development/libraries/glib/default.nix
···3232# $out/bin/gtester-report' to postInstall if this is solved
3333/*
3434 * Use --enable-installed-tests for GNOME-related packages,
3535- and use them as a separately installed tests runned by Hydra
3535+ and use them as a separately installed tests run by Hydra
3636 (they should test an already installed package)
3737 https://wiki.gnome.org/GnomeGoals/InstalledTests
3838 * Support org.freedesktop.Application, including D-Bus activation from desktop files
···163163 # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
164164 doCheck = false;
165165166166- # must be explicitely set since 5590e365
166166+ # must be explicitly set since 5590e365
167167 dontWrapQtApps = true;
168168169169 meta = with lib; {
···20202121 dontUseQmakeConfigure = true;
2222 configureFlags = [ "-config" "release" ]
2323- # Build mixes up dylibs/frameworks if one is not explicitely specified.
2323+ # Build mixes up dylibs/frameworks if one is not explicitly specified.
2424 ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ];
25252626 dontWrapQtApps = true;
+1-1
pkgs/development/libraries/ndn-cxx/default.nix
···43434444 meta = with lib; {
4545 homepage = "https://named-data.net/";
4646- description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
4646+ description = "A Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction";
4747 longDescription = ''
4848 ndn-cxx is a C++ library, implementing Named Data Networking (NDN)
4949 primitives that can be used to implement various NDN applications.
···35353636 makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
37373838- # Tuning (either autotuning or with hand-written paramters) is possible
3838+ # Tuning (either autotuning or with hand-written parameters) is possible
3939 # but not implemented here.
4040 # It seems buggy anyways (see homepage).
4141 buildFlags = [ "all" "${libbasename}${libext}" ];
···1919 PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3";
20202121 patches = [
2222- # Remove unecessary tests (valgrind, coverage)
2222+ # Remove unnecessary tests (valgrind, coverage)
2323 ./Makefile.patch
24242525 # Fix for building on darwin
+1-1
pkgs/development/octave-modules/vibes/default.nix
···2929 VIBes API that enables your program to communicate with the viewer in order
3030 to draw figures. This package integrates the VIBes API into Octave. The
3131 VIBes application is required for operation and must be installed
3232- seperately. Data types from third-party interval arithmetic libraries for
3232+ separately. Data types from third-party interval arithmetic libraries for
3333 Octave are also supported.
3434 '';
3535 # Marked this way until KarlJoad gets around to packaging the vibes program.
···99 pname = "backports.shutil_get_terminal_size";
1010 version = "unstable-2016-02-21";
11111212- # there have been numerous fixes commited since the initial release.
1212+ # there have been numerous fixes committed since the initial release.
1313 # Most notably fixing a problem where the backport would always return
1414 # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5.
1515 # Unfortunately the maintainer seems inactive and has not responded to
···3939 Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions:
40404141 - Require that every transaction touching an account have an accompanying document on disk.
4242- - Explictly declare the name of a document accompanying a transaction.
4242+ - Explicitly declare the name of a document accompanying a transaction.
4343 - Explicitly declare that a transaction is expected not to have an accompanying document.
4444 - Look for an "implicit" PDF document matching transaction data.
4545 - Associate (and require) a document with any type of entry, including open entries themselves.
···2727 checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
2828 propagatedBuildInputs = [ packaging torch scikit-learn tqdm ];
29293030- # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
3030+ # runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
3131 doCheck = pythonOlder "3.9";
32323333 # Some packages are not in NixPkgs; other tests try to build distributed
···5555 # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
5656 doCheck = false;
57575858- # sed calls will be unecessary in v3.1.11+
5858+ # sed calls will be unnecessary in v3.1.11+
5959 preConfigure = ''
6060 sed -i 's/==/>=/' setup.py
6161 '';
···2323 ];
24242525 doCheck = false;
2626- # Mouseinfo requires a X server running to import succesfully
2626+ # Mouseinfo requires a X server running to import successfully
2727 # pythonImportsCheck = [ "mouseinfo" ];
28282929 propagatedBuildInputs = [
+1-1
pkgs/development/python-modules/stone/default.nix
···2828 checkInputs = [ pytestCheckHook mock ];
29293030 # try to import from `test` directory, which is exported by the python interpreter
3131- # and cannot be overriden without removing some py3 to py2 support
3131+ # and cannot be overridden without removing some py3 to py2 support
3232 disabledTestPaths = [
3333 "test/test_tsd_types.py"
3434 "test/test_js_client.py"
···1414# gems that don't behave correctly, fixes are already provided in the form of
1515# derivations.
1616#
1717-# This seperates "what to build" (the exact gem versions) from "how to build"
1717+# This separates "what to build" (the exact gem versions) from "how to build"
1818# (to make gems behave if necessary).
19192020{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
···325325 # Script to create deps.nix file for dotnet dependencies. Run it with
326326 # $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file
327327 #
328328- # Default output path is /tmp/${pname}-deps.nix, but can be overriden with cli argument.
328328+ # Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument.
329329 #
330330 # Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix
331331 passthru.createDepsFile = writeShellApplication {
···171171172172 # Turn on --enable-new-dtags by default to make the linker set
173173 # RUNPATH instead of RPATH on binaries. This is important because
174174- # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
174174+ # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
175175 "--enable-new-dtags"
176176177177 # force target prefix. Some versions of binutils will make it empty if
+1-1
pkgs/development/tools/misc/binutils/default.nix
···167167168168 # Turn on --enable-new-dtags by default to make the linker set
169169 # RUNPATH instead of RPATH on binaries. This is important because
170170- # RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
170170+ # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
171171 "--enable-new-dtags"
172172173173 # force target prefix. Some versions of binutils will make it empty if
+1-1
pkgs/development/tools/misc/dura/default.nix
···3030 ];
31313232 meta = with lib; {
3333- description = "A background process that saves uncommited changes on git";
3333+ description = "A background process that saves uncommitted changes on git";
3434 longDescription = ''
3535 Dura is a background process that watches your Git repositories and
3636 commits your uncommitted changes without impacting HEAD, the current
···482482 /*
483483 The default list of poetry2nix override overlays
484484485485- Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function
485485+ Can be overridden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function
486486 */
487487 defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib poetryLib; });
488488
+1-1
pkgs/development/tools/tapview/default.nix
···1717 sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g=";
1818 };
19192020- # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected.
2020+ # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected.
2121 patches = [ ./dont_check_echo.patch ];
22222323 makeFlags = [ "prefix=$(out)" ];
+1-1
pkgs/games/gl-gsync-demo/default.nix
···2727 maintainers = with maintainers; [ atemu ];
2828 description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux";
2929 longDescription = ''
3030- The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate.
3030+ The demo simply draws a vertical bar moving across the screen at constant speed, but deliberately rendered at a variable frame rate.
31313232 The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps.
3333
+1-1
pkgs/games/openra/default.nix
···1313let
1414 /* Building an engine or out-of-tree mod is very similar,
1515 but different enough not to be able to build them with the same package definition,
1616- so instaed we define what is common between them in a seperate file.
1616+ so instaed we define what is common between them in a separate file.
17171818 Although `callPackage` could be used, it would require undoing `makeOverridable`,
1919 because `common.nix` does not define a package, but just an attribute set,
+1-1
pkgs/games/openra/packages.nix
···33let
44 /* Building an engine or out-of-tree mod is very similar,
55 but different enough not to be able to build them with the same package definition,
66- so instaed we define what is common between them in a seperate file.
66+ so instaed we define what is common between them in a separate file.
7788 Although `callPackage` could be used, it would require undoing `makeOverridable`,
99 because `common.nix` does not define a package, but just an attribute set,
+1-1
pkgs/misc/screensavers/alock/default.nix
···3232 description = "Simple screen lock application for X server";
3333 longDescription = ''
3434 alock locks the X server until the user enters a password
3535- via the keyboard. If the authentification was successful
3535+ via the keyboard. If the authentication was successful
3636 the X server is unlocked and the user can continue to work.
37373838 alock does not provide any fancy animations like xlock or
···136136 '';
137137138138 # Defining this here exposes it as a passthru attribute, which is useful because it allows us to run `builtins.hashFile` on it in pure-eval mode.
139139- # With that we can programatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login.
139139+ # With that we can programmatically generate an `/etc/sudoers.d` entry which disables the password requirement, so that a user-agent can run it at login.
140140 loadScriptingAddition = writeShellScript "yabai-load-sa" ''
141141 # For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error.
142142 # The installation command mutably installs binaries to '/System', but then fails to start them. Manually running
+2-2
pkgs/os-specific/linux/systemd/default.nix
···524524 ];
525525 preConfigure =
526526 let
527527- # A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files.
527527+ # A list of all the runtime binaries that the systemd executables, tests and libraries are referencing in their source code, scripts and unit files.
528528 # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message.
529529 binaryReplacements = [
530530 { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; }
···578578 "src/import/import-tar.c"
579579 ];
580580 ignore = [
581581- # occurences here refer to the tar sub command
581581+ # occurrences here refer to the tar sub command
582582 "src/sysupdate/sysupdate-resource.c"
583583 "src/sysupdate/sysupdate-transfer.c"
584584 "src/import/pull.c"
+1-1
pkgs/servers/nextcloud/default.nix
···4646 in your NixOS config.
47474848 WARNING: if you were on Nextcloud 22 on NixOS 22.05 you have to upgrade to Nextcloud 23
4949- first on 22.05 because Nextcloud doesn't support upgrades accross multiple major versions!
4949+ first on 22.05 because Nextcloud doesn't support upgrades across multiple major versions!
5050 '';
51515252 nextcloud24 = generic {
···192192193193 # Note: the duplication of executables is about 4MB size.
194194 # So a nicer solution was patching postgresql to allow setting the
195195- # libdir explicitely.
195195+ # libdir explicitly.
196196 postBuild = ''
197197 mkdir -p $out/bin
198198 rm $out/bin/{pg_config,postgres,pg_ctl}
+1-1
pkgs/servers/web-apps/netbox/default.nix
···3333 # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
3434 ./config.patch
3535 ./graphql-3_2_0.patch
3636- # fix compatiblity ith django 4.1
3636+ # fix compatibility ith django 4.1
3737 (fetchpatch {
3838 url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch";
3939 sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc=";
+1-1
pkgs/stdenv/generic/check-meta.nix
···7373 allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
74747575 # Check whether unfree packages are allowed and if not, whether the
7676- # package has an unfree license and is not explicitely allowed by the
7676+ # package has an unfree license and is not explicitly allowed by the
7777 # `allowUnfreePredicate` function.
7878 hasDeniedUnfreeLicense = attrs:
7979 hasUnfreeLicense attrs &&
+1-1
pkgs/tools/admin/azure-cli/default.nix
···1212 sha256 = "sha256-Y1P+cTOK7NbV7k9rg38vE7EPuZQo88IQW3IYYou8ZOI=";
1313 };
14141515- # put packages that needs to be overriden in the py package scope
1515+ # put packages that needs to be overridden in the py package scope
1616 py = import ./python-packages.nix {
1717 inherit stdenv lib src version python3;
1818 };
+1-1
pkgs/tools/admin/pgadmin/default.nix
···181181 # checks will be run through nixos/tests
182182 doCheck = false;
183183184184- # speaklater3 is seperate because when passing buildDeps
184184+ # speaklater3 is separate because when passing buildDeps
185185 # to the test, it fails there due to a collision with speaklater
186186 propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];
187187
+1-1
pkgs/tools/misc/fpart/default.nix
···35353636 Fpart also includes a live mode, which allows it to crawl very large
3737 filesystems and produce partitions in live. Hooks are available to act on
3838- those partitions (e.g. immediatly start a transfer using rsync(1))
3838+ those partitions (e.g. immediately start a transfer using rsync(1))
3939 without having to wait for the filesystem traversal job to be finished.
4040 Used this way, fpart can be seen as a powerful data migration tool.
4141 '';
+1-1
pkgs/tools/misc/librespeed-cli/default.nix
···16161717 vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";
18181919- # Tests have additonal requirements
1919+ # Tests have additional requirements
2020 doCheck = false;
21212222 meta = with lib; {
+1-1
pkgs/tools/misc/sqlite3-to-mysql/default.nix
···3535 # tests require a mysql server instance
3636 doCheck = false;
37373838- # run package tests as a seperate nixos test
3838+ # run package tests as a separate nixos test
3939 passthru.tests = {
4040 nixosTest = nixosTests.sqlite3-to-mysql;
4141 };
+1-1
pkgs/tools/networking/ipfetch/default.nix
···3030 '';
31313232 meta = with lib; {
3333- description = "Neofetch but for ip adresses";
3333+ description = "Neofetch but for ip addresses";
3434 license = licenses.gpl3Only;
3535 platforms = platforms.all;
3636 maintainers = with maintainers; [ annaaurora ];
+1-1
pkgs/tools/networking/ndn-tools/default.nix
···39394040 meta = with lib; {
4141 homepage = "https://named-data.net/";
4242- description = "Named Data Neworking (NDN) Essential Tools";
4242+ description = "Named Data Networking (NDN) Essential Tools";
4343 license = licenses.gpl3Plus;
4444 platforms = platforms.unix;
4545 maintainers = with maintainers; [ bertof ];
+1-1
pkgs/tools/typesetting/docbook2odf/default.nix
···3535 meta = with lib; {
3636 description = "Convert DocBook to OpenDocument Format (ODF)";
3737 longDescription = ''
3838- Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS
3838+ Docbook2odf is a toolkit that automatically converts DocBook to OASIS
3939 OpenDocument (ODF, the ISO standardized format used for texts,
4040 spreadsheets and presentations). Conversion is based on a XSLT which
4141 makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these
+1-1
pkgs/tools/wayland/wev/default.nix
···3333 homepage = "https://git.sr.ht/~sircmpwn/wev";
3434 description = "Wayland event viewer";
3535 longDescription = ''
3636- This is a tool for debugging events on a Wayland window, analagous to the
3636+ This is a tool for debugging events on a Wayland window, analogous to the
3737 X11 tool xev.
3838 '';
3939 license = licenses.mit;
+2-2
pkgs/top-level/all-packages.nix
···44124412 extrude = callPackage ../tools/security/extrude { };
4413441344144414 fastly = callPackage ../misc/fastly {
44154415- # If buildGoModule is overriden, provide a matching version of the go attribute
44154415+ # If buildGoModule is overridden, provide a matching version of the go attribute
44164416 };
4417441744184418 f2 = callPackage ../tools/misc/f2 {};
···14566145661456714567 fstar = callPackage ../development/compilers/fstar {
1456814568 # Work around while compatibility with ppxlib >= 0.26 is unavailable
1456914569- # Should be removed when a fix is availaible
1456914569+ # Should be removed when a fix is available
1457014570 # See https://github.com/FStarLang/FStar/issues/2681
1457114571 ocamlPackages =
1457214572 ocamlPackages.overrideScope' (self: super: {
···16161717 callPackage = self.newScope ({
1818 inherit (gnuradio)
1919- # Packages that are potentially overriden and used as deps here.
1919+ # Packages that are potentially overridden and used as deps here.
2020 boost
2121 volk
2222 ;
+1-1
pkgs/top-level/php-packages.nix
···6767 # source, based on the php version.
6868 #
6969 # Name passed is the name of the extension and is automatically used
7070- # to add the configureFlag "--enable-${name}", which can be overriden.
7070+ # to add the configureFlag "--enable-${name}", which can be overridden.
7171 #
7272 # Build inputs is used for extra deps that may be needed. And zendExtension
7373 # will mark the extension as a zend extension or not.