Merge staging-next into staging

Changed files
+487 -438
doc
lib
nixos
doc
lib
make-options-doc
modules
hardware
installer
cd-dvd
misc
security
services
audio
backup
blockchain
ethereum
cluster
continuous-integration
databases
display-managers
games
hardware
logging
mail
matrix
misc
monitoring
network-filesystems
networking
printing
security
system
torrent
video
web-apps
web-servers
x11
display-managers
hardware
virtualisation
tests
pkgs
applications
audio
editors
kakoune
plugins
emulators
citra
yuzu
misc
ipmiview
with-shell
networking
browsers
vivaldi
cluster
hadoop
mailreaders
mailnag
radio
science
logic
cvc5
monosat
math
molecular-dynamics
lammps
video
epgstation
kodi
window-managers
herbstluftwm
build-support
docker
dotnet
build-dotnet-module
fetchfirefoxaddon
release
rust
build-rust-crate
vm
data
fonts
google-fonts
profont
tamzen
misc
cacert
desktops
enlightenment
pantheon
desktop
elementary-session-settings
development
compilers
dotnet
elm
gcc
graalvm
community-edition
haskell-modules
interpreters
lua-5
octave
python
libraries
glib
gobject-introspection
gstreamer
khronos-ocl-icd-loader
libcommuni
ndn-cxx
science
math
blas
zn_poly
stargate-libcds
vulkan-headers
octave-modules
vibes
python-modules
awacs
azure-mgmt-containerservice
backports_shutil_get_terminal_size
beancount_docverif
buildbot
cleo
dj-database-url
duckdb-engine
ignite
mezzanine
mouseinfo
pyoverkiz
sphinxcontrib-katex
stone
ruby-modules
gem-config
tools
continuous-integration
github-runner
misc
binutils
dura
strace
poetry2nix
poetry2nix
tapview
games
gl-gsync-demo
openra
misc
dxvk
screensavers
alock
tmux-plugins
os-specific
darwin
yabai
linux
brillo
systemd
servers
dns
geospatial
martin
http
nginx
monitoring
nextcloud
nfd
sql
postgresql
web-apps
netbox
stdenv
generic
tools
admin
azure-cli
infra
pgadmin
misc
fpart
librespeed-cli
sqlite3-to-mysql
networking
ipfetch
ndn-tools
security
faraday-cli
typesetting
docbook2odf
tectonic
wayland
top-level
+1 -1
CONTRIBUTING.md
···
2. 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`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. 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.
-
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]`.
+
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]`.
6. 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.
## Criteria for Backporting changes
+1 -1
doc/contributing/reviewing-contributions.chapter.md
···
##### Comments
```
-
## Individual maintainer list {#reviewing-contributions-indvidual-maintainer-list}
+
## Individual maintainer list {#reviewing-contributions-individual-maintainer-list}
When adding users to `maintainers/maintainer-list.nix`, the following
checks should be performed:
+1 -1
doc/doc-support/lib-function-docs.nix
···
-
# Generates the documentation for library functons via nixdoc. To add
+
# Generates the documentation for library functions via nixdoc. To add
# another library function file to this list, the include list in the
# file `doc/functions/library.xml` must also be updated.
+1 -1
doc/languages-frameworks/beam.section.md
···
- run `mix2nix > mix_deps.nix` in the upstream repo.
- pass `mixNixDeps = with pkgs; import ./mix_deps.nix { inherit lib beamPackages; };` as an argument to mixRelease.
-
If there are git depencencies.
+
If there are git dependencies.
- 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`.
- 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
···
* `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).
* `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"; }`.
-
The associated package set can be optained using `mkCoqPackages coq`, where `coq` is the derivation to use.
+
The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use.
## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages}
+1 -1
doc/languages-frameworks/cuda.section.md
···
Nixpkgs tries to target support real architecture defaults based on the
CUDA toolkit version with PTX support for future hardware. Experienced
-
users may optmize this configuration for a variety of reasons such as
+
users may optimize this configuration for a variety of reasons such as
reducing binary size and compile time, supporting legacy hardware, or
optimizing for specific hardware.
+2 -2
doc/languages-frameworks/cuelang.section.md
···
```
- The first parameter is the Cue schema file.
-
- The second paramter is an options parameter, currently, only: `document` can be passed.
+
- The second parameter is an options parameter, currently, only: `document` can be passed.
-
`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.
+
`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.
Another example, given the following `validator.nix` :
```
+2 -2
doc/languages-frameworks/hy.section.md
···
### Installation without packages {#installation-without-packages}
-
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`.
+
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`.
::: {.caution}
-
Packages that are installed with your python derivation, are not accesible by `hy` this way.
+
Packages that are installed with your python derivation, are not accessible by `hy` this way.
:::
### Installation with packages {#installation-with-packages}
+1 -1
doc/languages-frameworks/index.xml
···
xml:id="chap-language-support">
<title>Languages and frameworks</title>
<para>
-
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.
+
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.
</para>
<xi:include href="agda.section.xml" />
<xi:include href="android.section.xml" />
+2 -2
doc/languages-frameworks/python.section.md
···
`test` command for a `checkPhase` which runs `pytest`. This is also beneficial
when a package may need many items disabled to run the test suite.
-
Using the example above, the analagous `pytestCheckHook` usage would be:
+
Using the example above, the analogous `pytestCheckHook` usage would be:
```
checkInputs = [ pytestCheckHook ];
···
];
```
-
This is expecially useful when tests need to be conditionally disabled,
+
This is especially useful when tests need to be conditionally disabled,
for example:
```
+1 -1
doc/languages-frameworks/rust.section.md
···
However, please check if it's possible to disable a problematic subset of the
test suite and leave a comment explaining your reasoning.
-
This can be achived with `--skip` in `checkFlags`:
+
This can be achieved with `--skip` in `checkFlags`:
```nix
rustPlatform.buildRustPackage {
+1 -1
doc/old/cross.txt
···
This is used by the Nix build process to set the dynamic linker, glibc
in the case of i686-linux using the default Nix packages collection.
-
Obiously, since we need to compile libstc++ for arm-linux with uClibc linking
+
Obviously, since we need to compile libstc++ for arm-linux with uClibc linking
will not be done correctly: you can't link object files built for arm-linux
with a glibc built for i686-linux.
+1 -1
doc/stdenv/multiple-output.chapter.md
···
`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.
::: {.warning}
-
`nix-env` silenty disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
+
`nix-env` silently disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example,
```ShellSession
$ nix-env -iA nixpkgs.coreutils.info
+2 -2
doc/stdenv/stdenv.chapter.md
···
##### `dontStripHost` {#var-stdenv-dontStripHost}
-
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.
+
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.
##### `dontStripTarget` {#var-stdenv-dontStripTarget}
-
Like `dontStrip`, but only affects the `strip` command targetting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
+
Like `dontStrip`, but only affects the `strip` command targeting the packages’ target platform. Useful when supporting cross compilation, but otherwise feel free to ignore.
##### `dontMoveSbin` {#var-stdenv-dontMoveSbin}
+1 -1
lib/attrsets.nix
···
matchAttrs :: AttrSet -> AttrSet -> Bool
*/
matchAttrs =
-
# Attribute set strucutre to match
+
# Attribute set structure to match
pattern:
# Attribute set to find patterns in
attrs:
+1 -1
lib/derivations.nix
···
situations below.
For illustration and/or testing, we define derivation such that its
-
evaluation is very noticable.
+
evaluation is very noticeable.
let derivation = throw "This won't be evaluated.";
+1 -1
lib/modules.nix
···
) (lib.functionArgs f);
# Note: we append in the opposite order such that we can add an error
-
# context on the explicited arguments of "args" too. This update
+
# context on the explicit arguments of "args" too. This update
# operator is used to make the "args@{ ... }: with args.lib;" notation
# works.
in f (args // extraArgs)
+2 -2
lib/strings.nix
···
*/
makeBinPath = makeSearchPathOutput "bin" "bin";
-
/* Normalize path, removing extranous /s
+
/* Normalize path, removing extraneous /s
Type: normalizePath :: string -> string
···
*/
escape = list: replaceStrings list (map (c: "\\${c}") list);
-
/* Escape occurence of the element of `list` in `string` by
+
/* Escape occurrence of the element of `list` in `string` by
converting to its ASCII value and prefixing it with \\x.
Only works for printable ascii characters.
+1 -1
lib/systems/architectures.nix
···
#
# Note:
#
-
# - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
+
# - The successors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
# which no current AMD Zen michroarch support.
# - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
# current Intel microarch support.
+2 -2
lib/systems/default.nix
···
# necessary.
#
# `parsed` is inferred from args, both because there are two options with one
-
# clearly prefered, and to prevent cycles. A simpler fixed point where the RHS
+
# clearly preferred, and to prevent cycles. A simpler fixed point where the RHS
# always just used `final.*` would fail on both counts.
elaborate = args': let
args = if lib.isString args' then { system = args'; }
···
linker =
/**/ if final.useLLVM or false then "lld"
else if final.isDarwin then "cctools"
-
# "bfd" and "gold" both come from GNU binutils. The existance of Gold
+
# "bfd" and "gold" both come from GNU binutils. The existence of Gold
# is why we use the more obscure "bfd" and not "binutils" for this
# choice.
else "bfd";
+1 -1
lib/systems/flake-systems.nix
···
# See [RFC 46] for mandated platform support and ../../pkgs/stdenv for
# implemented platform support. This list is mainly descriptive, i.e. all
-
# system doubles for platforms where nixpkgs can do native compiliation
+
# system doubles for platforms where nixpkgs can do native compilation
# reasonably well are included.
#
# [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
+1 -1
lib/tests/modules.sh
···
## Freeform modules
# Assigning without a declared option should work
checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
-
# No freeform assigments shouldn't make it error
+
# No freeform assignments shouldn't make it error
checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
# but only if the type matches
checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
+1 -1
nixos/doc/manual/configuration/profiles/hardened.section.md
···
available to processes through the `/sys` and
`/proc` filesystems. It also disables the User Namespaces
feature of the kernel, which stops Nix from being able to build anything
-
(this particular setting can be overriden via
+
(this particular setting can be overridden via
[](#opt-security.allowUserNamespaces)). See the
[profile source](https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix)
for further detail on which settings are altered.
+2 -2
nixos/doc/manual/development/activation-script.section.md
···
An activation script can write to special files instructing
`switch-to-configuration` to restart/reload units. The script will take these
-
requests into account and will incorperate the unit configuration as described
+
requests into account and will incorporate the unit configuration as described
above. This means that the activation script will "fake" a modified unit file
and `switch-to-configuration` will act accordingly. By doing so, configuration
like [systemd.services.\<name\>.restartIfChanged](#opt-systemd.services) is
···
`/run/nixos/dry-activation-reload-list`. Those files can contain
newline-separated lists of unit names where duplicates are being ignored. These
files are not create automatically and activation scripts must take the
-
possiblility into account that they have to create them first.
+
possibility into account that they have to create them first.
## NixOS snippets {#sec-activation-script-nixos-snippets}
+1 -1
nixos/doc/manual/development/option-types.section.md
···
It takes a parameter *`o`*, that should be a set, or a function returning
a set with an `options` key defining the sub-options. Submodule option
definitions are type-checked accordingly to the `options` declarations.
-
Of course, you can nest submodule option definitons for even higher
+
Of course, you can nest submodule option definitions for even higher
modularity.
The option set can be defined directly
+2 -2
nixos/doc/manual/development/writing-nixos-tests.section.md
···
: Wait until the supplied regular expressions match a line of the
serial console output. This method is useful when OCR is not
-
possibile or accurate enough.
+
possible or accurate enough.
`wait_for_window`
···
`start_job` and `stop_job`.
For faster dev cycles it\'s also possible to disable the code-linters
-
(this shouldn\'t be commited though):
+
(this shouldn\'t be committed though):
```nix
{
+1 -1
nixos/doc/manual/from_md/configuration/profiles/hardened.section.xml
···
available to processes through the <literal>/sys</literal> and
<literal>/proc</literal> filesystems. It also disables the User
Namespaces feature of the kernel, which stops Nix from being able to
-
build anything (this particular setting can be overriden via
+
build anything (this particular setting can be overridden via
<xref linkend="opt-security.allowUserNamespaces" />). See the
<link xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">profile
source</link> for further detail on which settings are altered.
+2 -2
nixos/doc/manual/from_md/development/activation-script.section.xml
···
An activation script can write to special files instructing
<literal>switch-to-configuration</literal> to restart/reload units.
The script will take these requests into account and will
-
incorperate the unit configuration as described above. This means
+
incorporate the unit configuration as described above. This means
that the activation script will <quote>fake</quote> a modified unit
file and <literal>switch-to-configuration</literal> will act
accordingly. By doing so, configuration like
···
<literal>/run/nixos/dry-activation-reload-list</literal>. Those
files can contain newline-separated lists of unit names where
duplicates are being ignored. These files are not create
-
automatically and activation scripts must take the possiblility into
+
automatically and activation scripts must take the possibility into
account that they have to create them first.
</para>
<section xml:id="sec-activation-script-nixos-snippets">
+1 -1
nixos/doc/manual/from_md/development/option-types.section.xml
···
<literal>options</literal> key defining the sub-options. Submodule
option definitions are type-checked accordingly to the
<literal>options</literal> declarations. Of course, you can nest
-
submodule option definitons for even higher modularity.
+
submodule option definitions for even higher modularity.
</para>
<para>
The option set can be defined directly
+2 -2
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml
···
<para>
Wait until the supplied regular expressions match a line of
the serial console output. This method is useful when OCR is
-
not possibile or accurate enough.
+
not possible or accurate enough.
</para>
</listitem>
</varlistentry>
···
</para>
<para>
For faster dev cycles it's also possible to disable the
-
code-linters (this shouldn't be commited though):
+
code-linters (this shouldn't be committed though):
</para>
<programlisting language="bash">
{
+2 -2
nixos/doc/manual/from_md/installation/building-nixos.chapter.xml
···
</itemizedlist>
<para>
System images, such as the live installer ones, know how to enforce
-
configuration settings on wich they immediately depend in order to
+
configuration settings on which they immediately depend in order to
work correctly.
</para>
<para>
···
it needs at a minimum for correct functioning, while the installer
base image overrides the entire file system layout because there
can’t be any other guarantees on a live medium than those given by
-
the live medium itself. The latter is especially true befor
+
the live medium itself. The latter is especially true before
formatting the target block device(s). On the other hand, the
netboot iso only overrides its minimum dependencies since netboot
images are always made-to-target.
+1 -1
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
···
<para>
You'll likely want to set a root password for your first boot
using the configuration files because you won't have a chance to
-
enter a password until after you reboot. You can initalize the
+
enter a password until after you reboot. You can initialize the
root password to an empty one with this line: (and of course
don't forget to set one once you've rebooted or to lock the
account with <literal>sudo passwd -l root</literal> if you use
+1 -1
nixos/doc/manual/from_md/installation/installing-virtualbox-guest.section.xml
···
-
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-instaling-virtualbox-guest">
+
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-installing-virtualbox-guest">
<title>Installing in a VirtualBox guest</title>
<para>
Installing NixOS into a VirtualBox guest is convenient for users who
+1 -1
nixos/doc/manual/from_md/installation/installing.chapter.xml
···
</para>
<para>
On the minimal installer, NetworkManager is not available, so
-
configuration must be perfomed manually. To configure the wifi,
+
configuration must be performed manually. To configure the wifi,
first start wpa_supplicant with
<literal>sudo systemctl start wpa_supplicant</literal>, then run
<literal>wpa_cli</literal>. For most home networks, you need to
+1 -1
nixos/doc/manual/from_md/release-notes/rl-1603.section.xml
···
<literal>services.udev.extraRules</literal> option now writes
rules to <literal>99-local.rules</literal> instead of
<literal>10-local.rules</literal>. This makes all the user rules
-
apply after others, so their results wouldn't be overriden by
+
apply after others, so their results wouldn't be overridden by
anything else.
</para>
</listitem>
+1 -1
nixos/doc/manual/from_md/release-notes/rl-1709.section.xml
···
<listitem>
<para>
<literal>services.firefox.syncserver</literal> now runs by
-
default as a non-root user. To accomodate this change, the
+
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.
+1 -1
nixos/doc/manual/from_md/release-notes/rl-1903.section.xml
···
<listitem>
<para>
The versioned <literal>postgresql</literal> have been renamed
-
to use underscore number seperators. For example,
+
to use underscore number separators. For example,
<literal>postgresql96</literal> has been renamed to
<literal>postgresql_9_6</literal>.
</para>
+2 -2
nixos/doc/manual/from_md/release-notes/rl-1909.section.xml
···
<listitem>
<para>
The <literal>prometheus-nginx-exporter</literal> package now
-
uses the offical exporter provided by NGINX Inc. Its metrics
+
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
<link xlink:href="https://github.com/nginxinc/nginx-prometheus-exporter">official
···
<para>
By default, prometheus exporters are now run with
<literal>DynamicUser</literal> enabled. Exporters that need a
-
real user, now run under a seperate user and group which
+
real user, now run under a separate user and group which
follow the pattern
<literal>&lt;exporter-name&gt;-exporter</literal>, instead of
the previous default <literal>nobody</literal> and
+1 -1
nixos/doc/manual/from_md/release-notes/rl-2105.section.xml
···
<listitem>
<para>
In the ACME module, the data used to build the hash for the
-
account directory has changed to accomodate new features to
+
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
+2 -2
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
···
<listitem>
<para>
<link xlink:href="https://maddy.email/">Maddy</link>, a free
-
an open source mail server. Availabe as
+
an open source mail server. Available as
<link linkend="opt-services.maddy.enable">services.maddy</link>.
</para>
</listitem>
···
derivation if <literal>name</literal> is
<literal>&quot;vim&quot;</literal> (the default). This
makes the <literal>wrapManual</literal> argument obsolete,
-
but this behavior can be overriden by setting the
+
but this behavior can be overridden by setting the
<literal>standalone</literal> argument.
</para>
</listitem>
+3 -3
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
···
</listitem>
<listitem>
<para>
-
Option descriptions, examples, and defaults writting in
-
DocBook are now deprecated. Using CommonMark is preferred and
-
will become the default in a future release.
+
Option descriptions, examples, and defaults writing in DocBook
+
are now deprecated. Using CommonMark is preferred and will
+
become the default in a future release.
</para>
</listitem>
<listitem>
+14 -6
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
···
<link linkend="opt-services.snapserver.openFirewall">services.snapserver.openFirewall</link>
module option default value has been changed from
<literal>true</literal> to <literal>false</literal>. You will
-
need to explicitely set this option to
-
<literal>true</literal>, or configure your firewall.
+
need to explicitly set this option to <literal>true</literal>,
+
or configure your firewall.
</para>
</listitem>
<listitem>
···
<link linkend="opt-services.tmate-ssh-server.openFirewall">services.tmate-ssh-server.openFirewall</link>
module option default value has been changed from
<literal>true</literal> to <literal>false</literal>. You will
-
need to explicitely set this option to
-
<literal>true</literal>, or configure your firewall.
+
need to explicitly set this option to <literal>true</literal>,
+
or configure your firewall.
</para>
</listitem>
<listitem>
···
<link linkend="opt-services.unifi-video.openFirewall">services.unifi-video.openFirewall</link>
module option default value has been changed from
<literal>true</literal> to <literal>false</literal>. You will
-
need to explicitely set this option to
-
<literal>true</literal>, or configure your firewall.
+
need to explicitly set this option to <literal>true</literal>,
+
or configure your firewall.
</para>
</listitem>
<listitem>
···
The new option <literal>users.motdFile</literal> allows
configuring a Message Of The Day that can be updated
dynamically.
+
</para>
+
</listitem>
+
<listitem>
+
<para>
+
Enabling global redirect in
+
<literal>services.nginx.virtualHosts</literal> now allows one
+
to add exceptions with the <literal>locations</literal>
+
option.
</para>
</listitem>
<listitem>
+2 -2
nixos/doc/manual/installation/building-nixos.chapter.md
···
- Combine them with (any of) your host config(s)
System images, such as the live installer ones, know how to enforce configuration settings
-
on wich they immediately depend in order to work correctly.
+
on which they immediately depend in order to work correctly.
However, if you are confident, you can opt to override those
enforced values with `mkForce`.
···
For example, the iso base image overrides those file systems which it needs at a minimum
for correct functioning, while the installer base image overrides the entire file system
layout because there can't be any other guarantees on a live medium than those given
-
by the live medium itself. The latter is especially true befor formatting the target
+
by the live medium itself. The latter is especially true before formatting the target
block device(s). On the other hand, the netboot iso only overrides its minimum dependencies
since netboot images are always made-to-target.
+1 -1
nixos/doc/manual/installation/installing-from-other-distro.section.md
···
You\'ll likely want to set a root password for your first boot using
the configuration files because you won\'t have a chance to enter a
-
password until after you reboot. You can initalize the root password
+
password until after you reboot. You can initialize the root password
to an empty one with this line: (and of course don\'t forget to set
one once you\'ve rebooted or to lock the account with
`sudo passwd -l root` if you use `sudo`)
+1 -1
nixos/doc/manual/installation/installing-virtualbox-guest.section.md
···
-
# Installing in a VirtualBox guest {#sec-instaling-virtualbox-guest}
+
# Installing in a VirtualBox guest {#sec-installing-virtualbox-guest}
Installing NixOS into a VirtualBox guest is convenient for users who
want to try NixOS without installing it on bare metal. If you want to
+1 -1
nixos/doc/manual/installation/installing.chapter.md
···
`systemctl stop NetworkManager`.
On the minimal installer, NetworkManager is not available, so
-
configuration must be perfomed manually. To configure the wifi, first
+
configuration must be performed manually. To configure the wifi, first
start wpa_supplicant with `sudo systemctl start wpa_supplicant`, then
run `wpa_cli`. For most home networks, you need to type in the following
commands:
+1 -1
nixos/doc/manual/release-notes/rl-1603.section.md
···
}
```
-
- `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.
+
- `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.
- 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.
+1 -1
nixos/doc/manual/release-notes/rl-1709.section.md
···
- `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.
-
- `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.
+
- `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.
- The `compiz` window manager and package was removed. The system support had been broken for several years.
+1 -1
nixos/doc/manual/release-notes/rl-1903.section.md
···
- 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.
-
- The versioned `postgresql` have been renamed to use underscore number seperators. For example, `postgresql96` has been renamed to `postgresql_9_6`.
+
- The versioned `postgresql` have been renamed to use underscore number separators. For example, `postgresql96` has been renamed to `postgresql_9_6`.
- 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.
+2 -2
nixos/doc/manual/release-notes/rl-1909.section.md
···
- 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.
-
- 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).
+
- 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).
- 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).
Nodejs 8 is scheduled EOL under the lifetime of 19.09 and has been dropped.
-
- 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`.
+
- 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`.
- 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.
+1 -1
nixos/doc/manual/release-notes/rl-2105.section.md
···
- The zookeeper package does not provide `zooInspector.sh` anymore, as that \"contrib\" has been dropped from upstream releases.
-
- 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.
+
- 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.
- [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.
+2 -2
nixos/doc/manual/release-notes/rl-2205.section.md
···
- [kanidm](https://kanidm.github.io/kanidm/stable/), an identity management server written in Rust. Available as [services.kanidm](#opt-services.kanidm.enableServer)
-
- [Maddy](https://maddy.email/), a free an open source mail server. Availabe as [services.maddy](#opt-services.maddy.enable).
+
- [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable).
- [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).
···
- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code
- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface:
-
* 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.
+
* 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.
* All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete.
* 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.
+1 -1
nixos/doc/manual/release-notes/rl-2211.section.md
···
- 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.
-
- Option descriptions, examples, and defaults writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release.
+
- Option descriptions, examples, and defaults writing in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release.
- 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.
+5 -3
nixos/doc/manual/release-notes/rl-2305.section.md
···
- `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/).
-
- 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.
+
- 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.
-
- 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.
+
- 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.
-
- 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.
+
- 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.
- 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.
···
- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically.
+
+
- Enabling global redirect in `services.nginx.virtualHosts` now allows one to add exceptions with the `locations` option.
- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
+1 -1
nixos/lib/make-options-doc/default.nix
···
{ pkgs
, lib
, options
-
, transformOptions ? lib.id # function for additional tranformations of the options
+
, transformOptions ? lib.id # function for additional transformations of the options
, documentType ? "appendix" # TODO deprecate "appendix" in favor of "none"
# and/or rename function to moduleOptionDoc for clean slate
+1 -1
nixos/modules/hardware/gpgsmartcards.nix
···
# https://salsa.debian.org/debian/gnupg2/-/blob/debian/main/debian/scdaemon.udev
# the latest rev of the entire debian gnupg2 repo as of 2021-04-28
-
# the scdaemon.udev file was last commited on 2021-01-05 (7817a03):
+
# the scdaemon.udev file was last committed on 2021-01-05 (7817a03):
scdaemonUdevRev = "01898735a015541e3ffb43c7245ac1e612f40836";
scdaemonRules = pkgs.fetchurl {
+1 -1
nixos/modules/hardware/openrazer.nix
···
boot.extraModulePackages = [ kernelPackages.openrazer ];
boot.kernelModules = drivers;
-
# Makes the man pages available so you can succesfully run
+
# Makes the man pages available so you can successfully run
# > systemctl --user help openrazer-daemon
environment.systemPackages = [ pkgs.python3Packages.openrazer-daemon.man ];
+1 -1
nixos/modules/hardware/printers.nix
···
default = {};
description = lib.mdDoc ''
Sets PPD options for the printer.
-
{command}`lpoptions [-p printername] -l` shows suported PPD options for the given printer.
+
{command}`lpoptions [-p printername] -l` shows supported PPD options for the given printer.
'';
};
};
+1 -1
nixos/modules/installer/cd-dvd/iso-image.nix
···
# The configuration file for syslinux.
-
# Notes on syslinux configuration and UNetbootin compatiblity:
+
# Notes on syslinux configuration and UNetbootin compatibility:
# * Do not use '/syslinux/syslinux.cfg' as the path for this
# configuration. UNetbootin will not parse the file and use it as-is.
# This results in a broken configuration if the partition label does
+1 -1
nixos/modules/misc/label.nix
···
variable (defaults to the value of
{option}`system.nixos.version`).
-
Can be overriden by setting {env}`NIXOS_LABEL`.
+
Can be overridden by setting {env}`NIXOS_LABEL`.
Useful for not loosing track of configurations built from different
nixos branches/revisions, e.g.:
+2 -2
nixos/modules/security/acme/default.nix
···
default = false;
description = lib.mdDoc ''
Whether to use the root user when generating certs. This is not recommended
-
for security + compatiblity reasons. If a service requires root owned certificates
+
for security + compatibility reasons. If a service requires root owned certificates
consider following the guide on "Using ACME with services demanding root
owned certificates" in the NixOS manual, and only using this as a fallback
or for testing.
···
To use the let's encrypt staging server, use security.acme.server =
"https://acme-staging-v02.api.letsencrypt.org/directory".
'')
-
(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.")
+
(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.")
(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")
(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")
(mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600)))
+1 -1
nixos/modules/security/apparmor.nix
···
# (indirectly read from /etc/apparmor.d/*, without recursing into sub-directory).
# Note that this does not remove profiles dynamically generated by libvirt.
[ "${pkgs.apparmor-utils}/bin/aa-remove-unknown" ] ++
-
# Optionaly kill the processes which are unconfined but now have a profile loaded
+
# Optionally kill the processes which are unconfined but now have a profile loaded
# (because AppArmor can only start to confine new processes).
optional cfg.killUnconfinedConfinables killUnconfinedConfinables;
ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown";
+2 -2
nixos/modules/security/pam.nix
···
defaultText = literalExpression "config.security.pam.mount.enable";
type = types.bool;
description = lib.mdDoc ''
-
Enable PAM mount (pam_mount) system to mount fileystems on user login.
+
Enable PAM mount (pam_mount) system to mount filesystems on user login.
'';
};
···
default = false;
type = types.bool;
description = lib.mdDoc ''
-
Wheather the delay after typing a wrong password should be disabled.
+
Whether the delay after typing a wrong password should be disabled.
'';
};
+1 -1
nixos/modules/security/pam_mount.nix
···
type = types.bool;
default = false;
description = lib.mdDoc ''
-
Enable PAM mount system to mount fileystems on user login.
+
Enable PAM mount system to mount filesystems on user login.
'';
};
+1 -1
nixos/modules/security/wrappers/default.nix
···
internal = true;
description = lib.mdDoc ''
This option defines the path to the wrapper programs. It
-
should not be overriden.
+
should not be overridden.
'';
};
};
+1 -1
nixos/modules/services/audio/icecast.nix
···
hostname = mkOption {
type = types.nullOr types.str;
-
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.";
+
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.";
default = config.networking.domain;
defaultText = literalExpression "config.networking.domain";
};
+2 -2
nixos/modules/services/backup/zfs-replication.nix
···
enable = mkEnableOption (lib.mdDoc "ZFS snapshot replication.");
followDelete = mkOption {
-
description = lib.mdDoc "Remove remote snapshots that don't have a local correspondant.";
+
description = lib.mdDoc "Remove remote snapshots that don't have a local correspondent.";
default = true;
type = types.bool;
};
···
};
localFilesystem = mkOption {
-
description = lib.mdDoc "Local ZFS fileystem from which snapshots should be sent. Defaults to the attribute name.";
+
description = lib.mdDoc "Local ZFS filesystem from which snapshots should be sent. Defaults to the attribute name.";
example = "pool/file/path";
type = types.str;
};
+3 -3
nixos/modules/services/backup/znapzend.nix
···
The znapzend backup plan to use for the source.
The plan specifies how often to backup and for how long to keep the
-
backups. It consists of a series of retention periodes to interval
+
backups. It consists of a series of retention periods to interval
associations:
```
···
mkSrcAttrs = srcCfg: with srcCfg; {
enabled = onOff enable;
-
# mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target
+
# mbuffer is not referenced by its full path to accommodate non-NixOS systems or differing mbuffer versions between source and target
mbuffer = with mbuffer; if enable then "mbuffer"
+ optionalString (port != null) ":${toString port}" else "off";
mbuffer_size = mbuffer.size;
···
compressed feature which adds the options `-Lce` to
the {command}`zfs send` command. When this is enabled, make
sure that both the sending and receiving pool have the same relevant
-
features enabled. Using `-c` will skip unneccessary
+
features enabled. Using `-c` will skip unnecessary
decompress-compress stages, `-L` is for large block
support and -e is for embedded data support. see
{manpage}`znapzend(1)`
+1 -1
nixos/modules/services/blockchain/ethereum/lighthouse.nix
···
type = types.bool;
default = false;
description = lib.mdDoc ''
-
Explictly disables syncing of deposit logs from the execution node.
+
Explicitly disables syncing of deposit logs from the execution node.
This overrides any previous option that depends on it.
Useful if you intend to run a non-validating beacon node.
'';
+1 -1
nixos/modules/services/cluster/kubernetes/addon-manager.nix
···
bootstrapAddons = mkOption {
description = lib.mdDoc ''
-
Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths.
+
Bootstrap addons are like regular addons, but they are applied with cluster-admin rights.
They are applied at addon-manager startup only.
'';
default = { };
+1 -1
nixos/modules/services/cluster/kubernetes/pki.nix
···
systemctl restart flannel
''}
-
echo "Node joined succesfully"
+
echo "Node joined successfully"
'')];
# isolate etcd on loopback at the master node
+1 -1
nixos/modules/services/continuous-integration/buildbot/master.nix
···
-
# NixOS module for Buildbot continous integration server.
+
# NixOS module for Buildbot continuous integration server.
{ config, lib, options, pkgs, ... }:
+1 -1
nixos/modules/services/continuous-integration/github-runner/options.nix
···
registration token on startup as needed. Make sure the PAT has a scope of
`admin:org` for organization-wide registrations or a scope of
`repo` for a single repository. Fine-grained PATs need read and write permission
-
to the "Adminstration" resources.
+
to the "Administration" resources.
Changing this option or the file's content triggers a new runner registration.
'';
+1 -1
nixos/modules/services/continuous-integration/gitlab-runner.nix
···
default = false;
description = lib.mdDoc ''
Finish all remaining jobs before stopping.
-
If not set gitlab-runner will stop immediatly without waiting
+
If not set gitlab-runner will stop immediately without waiting
for jobs to finish, which will lead to failed builds.
'';
};
+2 -2
nixos/modules/services/continuous-integration/hail.nix
···
default = false;
description = lib.mdDoc ''
Enables the Hail Auto Update Service. Hail can automatically deploy artifacts
-
built by a Hydra Continous Integration server. A common use case is to provide
-
continous deployment for single services or a full NixOS configuration.'';
+
built by a Hydra Continuous Integration server. A common use case is to provide
+
continuous deployment for single services or a full NixOS configuration.'';
};
profile = mkOption {
type = types.str;
+1 -1
nixos/modules/services/databases/firebird.nix
···
#
# Be careful, virtuoso-opensource also provides a different isql command !
-
# There are at least two ways to run firebird. superserver has been choosen
+
# There are at least two ways to run firebird. superserver has been chosen
# however there are no strong reasons to prefer this or the other one AFAIK
# Eg superserver is said to be most efficiently using resources according to
# http://www.firebirdsql.org/manual/qsg25-classic-or-super.html
+1 -1
nixos/modules/services/display-managers/greetd.nix
···
default = !(cfg.settings ? initial_session);
defaultText = literalExpression "!(config.services.greetd.settings ? initial_session)";
description = lib.mdDoc ''
-
Wether to restart greetd when it terminates (e.g. on failure).
+
Whether to restart greetd when it terminates (e.g. on failure).
This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin),
because every greetd restart will trigger the autologin again.
'';
+3 -3
nixos/modules/services/games/asf.nix
···
description = lib.mdDoc ''
If enabled, starts the ArchisSteamFarm service.
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.
-
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.
+
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.
'';
default = false;
};
···
ipcPasswordFile = mkOption {
type = types.nullOr types.path;
default = null;
-
description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group.";
+
description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group.";
};
ipcSettings = mkOption {
···
};
passwordFile = mkOption {
type = types.path;
-
description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group.";
+
description = lib.mdDoc "Path to a file containing the password. The file must be readable by the `asf` user/group.";
};
enabled = mkOption {
type = types.bool;
+1 -1
nixos/modules/services/games/minetest-server.nix
···
Path to logfile for logging.
If set to null, logging will be output to stdout which means
-
all output will be catched by systemd.
+
all output will be caught by systemd.
'';
};
+1 -1
nixos/modules/services/hardware/lirc.nix
···
[lircd]
nodaemon = False
'';
-
description = lib.mdDoc "LIRC default options descriped in man:lircd(8) ({file}`lirc_options.conf`)";
+
description = lib.mdDoc "LIRC default options described in man:lircd(8) ({file}`lirc_options.conf`)";
};
configs = mkOption {
+1 -1
nixos/modules/services/hardware/sane.nix
···
description = lib.mdDoc ''
Enable saned network daemon for remote connection to scanners.
-
saned would be runned from `scanner` user; to allow
+
saned would be run from `scanner` user; to allow
access to hardware that doesn't have `scanner` group
you should add needed groups to this user.
'';
+1 -1
nixos/modules/services/logging/logrotate.nix
···
default = null;
description = lib.mdDoc ''
How often to rotate the logs. Defaults to previously set global setting,
-
which itself defauts to weekly.
+
which itself defaults to weekly.
'';
};
+1 -1
nixos/modules/services/mail/mailman.nix
···
type = types.str;
example = "/run/secrets/ldap-bind";
description = lib.mdDoc ''
-
Path to the file containing the bind password of the servie account
+
Path to the file containing the bind password of the service account
defined by [](#opt-services.mailman.ldap.bindDn).
'';
};
+3 -3
nixos/modules/services/mail/postfix.nix
···
headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks;
-
aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in
+
aliases = let separator = if cfg.aliasMapType == "hash" then ":" else ""; in
optionalString (cfg.postmasterAlias != "") ''
-
postmaster${seperator} ${cfg.postmasterAlias}
+
postmaster${separator} ${cfg.postmasterAlias}
''
+ optionalString (cfg.rootAlias != "") ''
-
root${seperator} ${cfg.rootAlias}
+
root${separator} ${cfg.rootAlias}
''
+ cfg.extraAliases
;
+2 -2
nixos/modules/services/mail/roundcube.nix
···
'';
description = lib.mdDoc ''
-
The package which contains roundcube's sources. Can be overriden to create
+
The package which contains roundcube's sources. Can be overridden to create
an environment which contains roundcube and third-party plugins.
'';
};
···
default = [];
example = literalExpression "with pkgs.aspellDicts; [ en fr de ]";
description = lib.mdDoc ''
-
List of aspell dictionnaries for spell checking. If empty, spell checking is disabled.
+
List of aspell dictionaries for spell checking. If empty, spell checking is disabled.
'';
};
+2 -2
nixos/modules/services/matrix/mautrix-telegram.nix
···
`MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN`.
These environment variables can also be used to set other options by
-
replacing hierachy levels by `.`, converting the name to uppercase
+
replacing hierarchy levels by `.`, converting the name to uppercase
and prepending `MAUTRIX_TELEGRAM_`.
For example, the first value above maps to
{option}`settings.appservice.as_token`.
···
path = [ pkgs.lottieconverter ];
# mautrix-telegram tries to generate a dotfile in the home directory of
-
# the running user if using a postgresql databse:
+
# the running user if using a postgresql database:
#
# File "python3.10/site-packages/asyncpg/connect_utils.py", line 257, in _dot_postgre>
# return (pathlib.Path.home() / '.postgresql' / filename).resolve()
+1 -1
nixos/modules/services/matrix/synapse.nix
···
(mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." )
(mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." )
-
# options that were moved into rfc42 style settigns
+
# options that were moved into rfc42 style settings
(mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_files instead" )
(mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" )
(mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" )
+1 -1
nixos/modules/services/misc/dysnomia.nix
···
};
components = mkOption {
-
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";
+
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";
default = {};
type = types.attrsOf types.attrs;
};
+1 -1
nixos/modules/services/misc/gammu-smsd.nix
···
password = mkOption {
type = types.nullOr types.str;
default = null;
-
description = lib.mdDoc "User password used for connetion to the database";
+
description = lib.mdDoc "User password used for connection to the database";
};
};
};
+2 -2
nixos/modules/services/misc/gitea.nix
···
file = mkOption {
type = types.nullOr types.str;
default = null;
-
description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is choosen by gitea.";
+
description = lib.mdDoc "Filename to be used for the dump. If `null` a default name is chosen by gitea.";
example = "gitea-dump";
};
};
···
# In older versions the secret naming for JWT was kind of confusing.
# The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET
-
# wasn't persistant at all.
+
# wasn't persistent at all.
# To fix that, there is now the file oauth2_jwt_secret containing the
# values for JWT_SECRET and the file jwt_secret gets renamed to
# lfs_jwt_secret.
+1 -1
nixos/modules/services/misc/gitlab.xml
···
</para>
<para>
-
A list of all availabe rake tasks can be obtained by running:
+
A list of all available rake tasks can be obtained by running:
<screen>
<prompt>$ </prompt>sudo -u git -H gitlab-rake -T
</screen>
+1 -1
nixos/modules/services/misc/jellyfin.nix
···
ProtectKernelTunables = !config.boot.isContainer;
LockPersonality = true;
PrivateTmp = !config.boot.isContainer;
-
# needed for hardware accelaration
+
# needed for hardware acceleration
PrivateDevices = false;
PrivateUsers = true;
RemoveIPC = true;
+2 -2
nixos/modules/services/misc/nix-daemon.nix
···
By default, pseudo-features `nixos-test`, `benchmark`,
and `big-parallel` used in Nixpkgs are set, `kvm`
-
is also included in it is avaliable.
+
is also included in it is available.
'';
};
···
description = lib.mdDoc ''
Configuration for Nix, see
<https://nixos.org/manual/nix/stable/#sec-conf-file> or
-
{manpage}`nix.conf(5)` for avalaible options.
+
{manpage}`nix.conf(5)` for available options.
The value declared here will be translated directly to the key-value pairs Nix expects.
You can use {command}`nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings`
+1 -1
nixos/modules/services/misc/podgrab.nix
···
example = "/run/secrets/password.env";
description = lib.mdDoc ''
The path to a file containing the PASSWORD environment variable
-
definition for Podgrab's authentification.
+
definition for Podgrab's authentication.
'';
};
+1 -1
nixos/modules/services/misc/portunus.nix
···
type = types.bool;
default = false;
description = lib.mdDoc ''
-
Wether to enable LDAPS protocol.
+
Whether to enable LDAPS protocol.
This also adds two entries to the `/etc/hosts` file to point [](#opt-services.portunus.domain) to localhost,
so that CLIs and programs can use ldaps protocol and verify the certificate without opening the firewall port for the protocol.
+1 -1
nixos/modules/services/misc/serviio.nix
···
23424 # mediabrowser
];
allowedUDPPorts = [
-
1900 # UPnP service discovey
+
1900 # UPnP service discovery
];
};
};
+1 -1
nixos/modules/services/misc/sourcehut/service.nix
···
# Note that each systemd service gets its own ${runDir}/config.ini file.
ExecStartPre = mkBefore [("+"+pkgs.writeShellScript "${serviceName}-credentials" ''
set -x
-
# Replace values begining with a '<' by the content of the file whose name is after.
+
# Replace values beginning with a '<' by the content of the file whose name is after.
gawk '{ if (match($0,/^([^=]+=)<(.+)/,m)) { getline f < m[2]; print m[1] f } else print $0 }' ${configIni} |
${optionalString (!allowStripe) "gawk '!/^stripe-secret-key=/' |"}
install -o ${srvCfg.user} -g root -m 400 /dev/stdin ${runDir}/config.ini
+2 -2
nixos/modules/services/misc/taskserver/default.nix
···
in lib.mdDoc ''
Whether to enable the Taskwarrior server.
-
More instructions about NixOS in conjuction with Taskserver can be
+
More instructions about NixOS in conjunction with Taskserver can be
found [in the NixOS manual](${url}).
'';
};
···
client id (such as `task 2.3.0`).
The values `all` or `none` have
-
special meaning. Overidden by any entry in the option
+
special meaning. Overridden by any entry in the option
{option}`services.taskserver.disallowedClientIDs`.
'';
};
+2 -2
nixos/modules/services/monitoring/graphite.nix
···
};
blacklist = mkOption {
-
description = lib.mdDoc "Any metrics received which match one of the experssions will be dropped.";
+
description = lib.mdDoc "Any metrics received which match one of the expressions will be dropped.";
default = null;
type = types.nullOr types.str;
example = "^some\\.noisy\\.metric\\.prefix\\..*";
};
whitelist = mkOption {
-
description = lib.mdDoc "Only metrics received which match one of the experssions will be persisted.";
+
description = lib.mdDoc "Only metrics received which match one of the expressions will be persisted.";
default = null;
type = types.nullOr types.str;
example = ".*";
+2 -2
nixos/modules/services/monitoring/prometheus/exporters.xml
···
by default</link>, via http under <literal>/metrics</literal>. In this
example the firewall should just allow incoming connections to the
exporter's port on the bridge interface <literal>br0</literal> (this would
-
have to be configured seperately of course). For more information about
+
have to be configured separately of course). For more information about
configuration see <literal>man configuration.nix</literal> or search through
the
<link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
···
# for the exporter's systemd service. One of
# `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart`
# has to be specified here. This will be merged with the default
-
# service confiuration.
+
# service configuration.
# Note that by default 'DynamicUser' is 'true'.
serviceOpts = {
serviceConfig = {
+1 -1
nixos/modules/services/monitoring/prometheus/exporters/nginxlog.nix
···
settings that can all be used here: https://github.com/martin-helmich/prometheus-nginxlog-exporter
The `listen` object is already generated by `port`, `listenAddress` and `metricsEndpoint` and
-
will be merged with the value of `settings` before writting it as JSON.
+
will be merged with the value of `settings` before writing it as JSON.
'';
};
+1 -1
nixos/modules/services/monitoring/thanos.nix
···
max-time = mkParamDef types.str "9999-12-31T23:59:59Z" ''
End of time range limit to serve.
-
Thanos Store serves only blocks, which happened eariler than this
+
Thanos Store serves only blocks, which happened earlier than this
value. Option can be a constant time in RFC3339 format or time duration
relative to current time, such as -1d or 2h45m. Valid duration units are
ms, s, m, h, d, w, y.
+2 -2
nixos/modules/services/monitoring/ups.nix
···
upsOptions = {name, config, ...}:
{
options = {
-
# This can be infered from the UPS model by looking at
+
# This can be inferred from the UPS model by looking at
# /nix/store/nut/share/driver.list
driver = mkOption {
type = types.str;
···
"}
'';
"nut/upssched.conf".source = cfg.schedulerRules;
-
# These file are containing private informations and thus should not
+
# These file are containing private information and thus should not
# be stored inside the Nix store.
/*
"nut/upsd.conf".source = "";
+1 -1
nixos/modules/services/network-filesystems/kubo.nix
···
services.kubo = {
-
enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degredation)");
+
enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degradation)");
package = mkOption {
type = types.package;
+2 -2
nixos/modules/services/network-filesystems/moosefs.nix
···
chunkserverCfg = settingsFormat.generate
"mfschunkserver.cfg" cfg.chunkserver.settings;
-
# generic template for all deamons
+
# generic template for all daemons
systemdService = name: extraConfig: configFile: {
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
···
Enable Moosefs master daemon.
You need to run `mfsmaster-init` on a freshly installed master server to
-
initialize the `DATA_PATH` direcory.
+
initialize the `DATA_PATH` directory.
'';
default = false;
};
+1 -1
nixos/modules/services/network-filesystems/orangefs/client.nix
···
fileSystems = mkOption {
description = lib.mdDoc ''
The orangefs file systems to be mounted.
-
This option is prefered over using {option}`fileSystems` directly since
+
This option is preferred over using {option}`fileSystems` directly since
the pvfs client service needs to be running for it to be mounted.
'';
+1 -1
nixos/modules/services/network-filesystems/orangefs/server.nix
···
after = [ "network-online.target" ];
serviceConfig = {
-
# Run as "simple" in forground mode.
+
# Run as "simple" in foreground mode.
# This is more reliable
ExecStart = ''
${pkgs.orangefs}/bin/pvfs2-server -d \
+1 -1
nixos/modules/services/networking/3proxy.nix
···
description = lib.mdDoc ''
List of target IP ranges, use empty list for any.
May also contain host names instead of addresses.
-
It's possible to use wildmask in the begginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
+
It's possible to use wildmask in the beginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
Hostname is only checked if hostname presents in request.
'';
};
+2 -2
nixos/modules/services/networking/biboumi.nix
···
default = "/etc/ssl/certs/ca-certificates.crt";
description = lib.mdDoc ''
Specifies which file should be used as the list of trusted CA
-
when negociating a TLS session.
+
when negotiating a TLS session.
'';
};
options.db_name = mkOption {
···
description = lib.mdDoc ''
A directory that should contain the policy files,
used to customize Botan’s behaviour
-
when negociating the TLS connections with the IRC servers.
+
when negotiating the TLS connections with the IRC servers.
'';
};
options.port = mkOption {
+1 -1
nixos/modules/services/networking/bitcoind.nix
···
}
'';
type = types.attrsOf (types.submodule rpcUserOpts);
-
description = lib.mdDoc "RPC user information for JSON-RPC connnections.";
+
description = lib.mdDoc "RPC user information for JSON-RPC connections.";
};
};
+1 -1
nixos/modules/services/networking/bitlbee.nix
···
type = types.str;
default = "127.0.0.1";
description = lib.mdDoc ''
-
The interface the BitlBee deamon will be listening to. If `127.0.0.1`,
+
The interface the BitlBee daemon will be listening to. If `127.0.0.1`,
only clients on the local host can connect to it; if `0.0.0.0`, clients
can access it from any network interface.
'';
+1 -1
nixos/modules/services/networking/consul.nix
···
};
consulAddr = mkOption {
-
description = lib.mdDoc "Consul api listening adddress";
+
description = lib.mdDoc "Consul api listening address";
default = "localhost:8500";
type = types.str;
};
+1 -1
nixos/modules/services/networking/epmd.nix
···
default = "[::]:4369";
description = lib.mdDoc ''
the listenStream used by the systemd socket.
-
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations.
+
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more information.
use this to change the port epmd will run on.
if not defined, epmd will use "[::]:4369"
'';
+2 -2
nixos/modules/services/networking/hans.nix
···
passwordFile = mkOption {
type = types.str;
default = "";
-
description = lib.mdDoc "File that containts password";
+
description = lib.mdDoc "File that contains password";
};
};
···
passwordFile = mkOption {
type = types.str;
default = "";
-
description = lib.mdDoc "File that containts password";
+
description = lib.mdDoc "File that contains password";
};
};
+2 -2
nixos/modules/services/networking/headscale.nix
···
type = types.attrsOf types.str;
default = { };
description = lib.mdDoc ''
-
Domain map is used to map incomming users (by their email) to
+
Domain map is used to map incoming users (by their email) to
a namespace. The key can be a string, or regex.
'';
example = {
···
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
-
Path to a file containg ACL policies.
+
Path to a file containing ACL policies.
'';
};
+1 -1
nixos/modules/services/networking/hylafax/systemd.nix
···
hardenService =
# Add some common systemd service hardening settings,
# but allow each service (here) to override
-
# settings by explicitely setting those to `null`.
+
# settings by explicitly setting those to `null`.
# More hardening would be nice but makes
# customizing hylafax setups very difficult.
# If at all, it should only be added along
+1 -1
nixos/modules/services/networking/i2pd.nix
···
type = with types; nullOr str;
default = null;
description = lib.mdDoc ''
-
Router Familiy to trust for first hops.
+
Router Family to trust for first hops.
'';
};
+1 -1
nixos/modules/services/networking/iperf3.nix
···
port = mkOption {
type = types.ints.u16;
default = 5201;
-
description = lib.mdDoc "Server port to listen on for iperf3 client requsts.";
+
description = lib.mdDoc "Server port to listen on for iperf3 client requests.";
};
affinity = mkOption {
type = types.nullOr types.ints.unsigned;
+4 -4
nixos/modules/services/networking/kea.nix
···
type = listOf str;
default = [];
description = lib.mdDoc ''
-
List of additonal arguments to pass to the daemon.
+
List of additional arguments to pass to the daemon.
'';
};
···
type = listOf str;
default = [];
description = lib.mdDoc ''
-
List of additonal arguments to pass to the daemon.
+
List of additional arguments to pass to the daemon.
'';
};
···
type = listOf str;
default = [];
description = lib.mdDoc ''
-
List of additonal arguments to pass to the daemon.
+
List of additional arguments to pass to the daemon.
'';
};
···
type = listOf str;
default = [];
description = lib.mdDoc ''
-
List of additonal arguments to pass to the daemon.
+
List of additional arguments to pass to the daemon.
'';
};
+1 -1
nixos/modules/services/networking/knot.nix
···
type = types.listOf types.str;
default = [];
description = lib.mdDoc ''
-
List of additional command line paramters for knotd
+
List of additional command line parameters for knotd
'';
};
+1 -1
nixos/modules/services/networking/libreswan.nix
···
type = types.bool;
default = true;
description = lib.mdDoc ''
-
Whether to disable send and accept redirects for all nework interfaces.
+
Whether to disable send and accept redirects for all network interfaces.
See the Libreswan [
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.
'';
+1 -1
nixos/modules/services/networking/lxd-image-server.nix
···
};
};
})
-
# this is seperate so it can be enabled on mirrored hosts
+
# this is separate so it can be enabled on mirrored hosts
(mkIf (cfg.nginx.enable) {
# https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf
services.nginx.virtualHosts = {
+1 -1
nixos/modules/services/networking/mosquitto.nix
···
Directories to be scanned for further config files to include.
Directories will processed in the order given,
`*.conf` files in the directory will be
-
read in case-sensistive alphabetical order.
+
read in case-sensitive alphabetical order.
'';
default = [];
};
+1 -1
nixos/modules/services/networking/ncdns.nix
···
```
bit. IN NS ns1.example.com.
```
-
If unset ncdns will generate an internal psuedo-hostname under the
+
If unset ncdns will generate an internal pseudo-hostname under the
zone, which will resolve to the value of
{option}`services.ncdns.identity.address`.
If you are only using ncdns locally you can ignore this.
+2 -2
nixos/modules/services/networking/ndppd.nix
···
timeout = mkOption {
type = types.int;
description = lib.mdDoc ''
-
Controls how long to wait for a Neighbor Advertisment Message before
+
Controls how long to wait for a Neighbor Advertisement Message before
invalidating the entry, in milliseconds.
'';
default = 500;
···
type = types.nullOr types.str;
description = lib.mdDoc ''
This is the target address is to match against. If no netmask
-
is provided, /128 is assumed. The addresses of serveral rules
+
is provided, /128 is assumed. The addresses of several rules
may or may not overlap.
Defaults to the name of the attrset.
'';
+1 -1
nixos/modules/services/networking/nftables.nix
···
# Check out https://wiki.nftables.org/ for better documentation.
# Table for both IPv4 and IPv6.
table inet filter {
-
# Block all incomming connections traffic except SSH and "ping".
+
# Block all incoming connections traffic except SSH and "ping".
chain input {
type filter hook input priority 0;
+1 -1
nixos/modules/services/networking/nsd.nix
···
default = null;
example = "2000::1@1234";
description = lib.mdDoc ''
-
This address will be used for zone-transfere requests if configured
+
This address will be used for zone-transfer requests if configured
as a secondary server or notifications in case of a primary server.
Supply either a plain IPv4 or IPv6 address with an optional port
number (ip@port).
+1 -1
nixos/modules/services/networking/ostinato.nix
···
default = "0.0.0.0";
description = lib.mdDoc ''
By default, the Drone RPC server will listen on all interfaces and
-
local IPv4 adresses for incoming connections from clients. Specify
+
local IPv4 addresses for incoming connections from clients. Specify
a single IPv4 or IPv6 address if you want to restrict that.
To listen on any IPv6 address, use ::
'';
+1 -1
nixos/modules/services/networking/pleroma.nix
···
the right place to store any secret
Have a look to Pleroma section in the NixOS manual for more
-
informations.
+
information.
'';
};
+4 -4
nixos/modules/services/networking/prosody.nix
···
type = types.int;
default = 300;
description = lib.mdDoc ''
-
Timout after which the room is destroyed or unlocked if not
+
Timeout after which the room is destroyed or unlocked if not
configured, in seconds
'';
};
···
Setting this option to true will prevent you from building a
NixOS configuration which won't comply with this standard.
-
You can explicitely decide to ignore this standard if you
+
You can explicitly decide to ignore this standard if you
know what you are doing by setting this option to false.
[1] https://xmpp.org/extensions/xep-0423.html
···
extraPluginPaths = mkOption {
type = types.listOf types.path;
default = [];
-
description = lib.mdDoc "Addtional path in which to look find plugins/modules";
+
description = lib.mdDoc "Additional path in which to look find plugins/modules";
};
uploadHttp = mkOption {
···
Having a server not XEP-0423-compliant might make your XMPP
experience terrible. See the NixOS manual for further
-
informations.
+
information.
If you know what you're doing, you can disable this warning by
setting config.services.prosody.xmppComplianceSuite to false.
+1 -1
nixos/modules/services/networking/radicale.nix
···
<https://radicale.org/3.0.html#documentation/authentication-and-rights>.
This option only works in conjunction with {option}`settings`.
Setting this will also set {option}`settings.rights.type` and
-
{option}`settings.rights.file` to approriate values.
+
{option}`settings.rights.file` to appropriate values.
'';
default = { };
example = literalExpression ''
+2 -2
nixos/modules/services/networking/searx.nix
···
description = lib.mdDoc ''
Whether to run searx in uWSGI as a "vassal", instead of using its
built-in HTTP server. This is the recommended mode for public or
-
large instances, but is unecessary for LAN or local-only use.
+
large instances, but is unnecessary for LAN or local-only use.
::: {.warning}
The built-in HTTP server logs all queries by default.
···
module = "searx.webapp";
env = [
"SEARX_SETTINGS_PATH=${cfg.settingsFile}"
-
# searxng compatiblity https://github.com/searxng/searxng/issues/1519
+
# searxng compatibility https://github.com/searxng/searxng/issues/1519
"SEARXNG_SETTINGS_PATH=${cfg.settingsFile}"
];
buffer-size = 32768;
+1 -1
nixos/modules/services/networking/stunnel.nix
···
servers = mkOption {
description = lib.mdDoc ''
-
Define the server configuations.
+
Define the server configurations.
See "SERVICE-LEVEL OPTIONS" in {manpage}`stunnel(8)`.
'';
+1 -1
nixos/modules/services/networking/unbound.nix
···
NotifyAccess = "main";
Type = "notify";
-
# FIXME: Which of these do we actualy need, can we drop the chroot flag?
+
# FIXME: Which of these do we actually need, can we drop the chroot flag?
AmbientCapabilities = [
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"
+1 -1
nixos/modules/services/networking/unifi.nix
···
default = null;
example = 4096;
description = lib.mdDoc ''
-
Set the maximimum heap size for the JVM in MB. If this option isn't set, the
+
Set the maximum heap size for the JVM in MB. If this option isn't set, the
JVM will decide this value at runtime.
'';
};
+1 -1
nixos/modules/services/networking/vsftpd.nix
···
The default is a file containing the users from {option}`userlist`.
-
If explicitely set to null userlist_file will not be set in vsftpd's config file.
+
If explicitly set to null userlist_file will not be set in vsftpd's config file.
'';
};
+1 -1
nixos/modules/services/networking/wireguard.nix
···
set -e
# If the parent dir does not already exist, create it.
-
# Otherwise, does nothing, keeping existing permisions intact.
+
# Otherwise, does nothing, keeping existing permissions intact.
mkdir -p --mode 0755 "${dirOf values.privateKeyFile}"
if [ ! -f "${values.privateKeyFile}" ]; then
+2 -2
nixos/modules/services/networking/yggdrasil.xml
···
settings = {
Peers = [
# Yggdrasil will automatically connect and "peer" with other nodes it
-
# discovers via link-local multicast annoucements. Unless this is the
+
# discovers via link-local multicast announcements. Unless this is the
# case (it probably isn't) a node needs peers within the existing
# network that it can tunnel to.
"tcp://1.2.3.4:1024"
···
}];
services.radvd = {
-
# Annouce the 300::/8 prefix to eth0.
+
# Announce the 300::/8 prefix to eth0.
enable = true;
config = ''
interface eth0
+1 -1
nixos/modules/services/printing/ipp-usb.nix
···
config = lib.mkIf config.services.ipp-usb.enable {
systemd.services.ipp-usb = {
description = "Daemon for IPP over USB printer support";
-
after = [ "cups.service" "avahi-deamon.service" ];
+
after = [ "cups.service" "avahi-daemon.service" ];
wants = [ "avahi-daemon.service" ];
serviceConfig = {
ExecStart = [ "${pkgs.ipp-usb}/bin/ipp-usb" ];
+2 -2
nixos/modules/services/security/fail2ban.nix
···
type = types.str;
example = "2 4 16 128";
description = lib.mdDoc ''
-
"bantime-increment.multipliers" used to calculate next value of ban time instead of formula, coresponding
+
"bantime-increment.multipliers" used to calculate next value of ban time instead of formula, corresponding
previously ban count and given "bantime.factor" (for multipliers default is 1);
following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count,
always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours
···
example = true;
description = lib.mdDoc ''
"bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed
-
cross over all jails, if false (dafault), only current jail of the ban IP will be searched
+
cross over all jails, if false (default), only current jail of the ban IP will be searched
'';
};
+2 -2
nixos/modules/services/security/shibboleth-sp.nix
···
fastcgi.shibAuthorizerPort = mkOption {
type = types.int;
default = 9100;
-
description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to";
+
description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to";
};
fastcgi.shibResponderPort = mkOption {
type = types.int;
default = 9101;
-
description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to";
+
description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to";
};
};
};
+10 -10
nixos/modules/services/security/tor.nix
···
]))];
description = lib.mdDoc (descriptionGeneric optionName);
};
-
optionBandwith = optionName: mkOption {
+
optionBandwidth = optionName: mkOption {
type = with types; nullOr (either int str);
default = null;
description = lib.mdDoc (descriptionGeneric optionName);
···
(mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "isolationOptions" ] "Use services.tor.settings.TransPort instead.")
(mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "listenAddress" ] "Use services.tor.settings.TransPort instead.")
(mkRenamedOptionModule [ "services" "tor" "controlPort" ] [ "services" "tor" "settings" "ControlPort" ])
-
(mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Plese use services.tor.settings instead.")
+
(mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Please use services.tor.settings instead.")
(mkRenamedOptionModule [ "services" "tor" "hiddenServices" ] [ "services" "tor" "relay" "onionServices" ])
(mkRenamedOptionModule [ "services" "tor" "relay" "accountingMax" ] [ "services" "tor" "settings" "AccountingMax" ])
(mkRenamedOptionModule [ "services" "tor" "relay" "accountingStart" ] [ "services" "tor" "settings" "AccountingStart" ])
···
};
options.Address = optionString "Address";
options.AssumeReachable = optionBool "AssumeReachable";
-
options.AccountingMax = optionBandwith "AccountingMax";
+
options.AccountingMax = optionBandwidth "AccountingMax";
options.AccountingStart = optionString "AccountingStart";
options.AuthDirHasIPv6Connectivity = optionBool "AuthDirHasIPv6Connectivity";
options.AuthDirListBadExits = optionBool "AuthDirListBadExits";
···
default = [".onion" ".exit"];
example = [".onion"];
};
-
options.BandwidthBurst = optionBandwith "BandwidthBurst";
-
options.BandwidthRate = optionBandwith "BandwidthRate";
+
options.BandwidthBurst = optionBandwidth "BandwidthBurst";
+
options.BandwidthRate = optionBandwidth "BandwidthRate";
options.BridgeAuthoritativeDir = optionBool "BridgeAuthoritativeDir";
options.BridgeRecordUsageByCountry = optionBool "BridgeRecordUsageByCountry";
options.BridgeRelay = optionBool "BridgeRelay" // { default = false; };
···
options.LogMessageDomains = optionBool "LogMessageDomains";
options.LongLivedPorts = optionPorts "LongLivedPorts";
options.MainloopStats = optionBool "MainloopStats";
-
options.MaxAdvertisedBandwidth = optionBandwith "MaxAdvertisedBandwidth";
+
options.MaxAdvertisedBandwidth = optionBandwidth "MaxAdvertisedBandwidth";
options.MaxCircuitDirtiness = optionInt "MaxCircuitDirtiness";
options.MaxClientCircuitsPending = optionInt "MaxClientCircuitsPending";
options.NATDPort = optionIsolablePorts "NATDPort";
···
options.OfflineMasterKey = optionBool "OfflineMasterKey";
options.OptimisticData = optionBool "OptimisticData"; # default is null and like "auto"
options.PaddingStatistics = optionBool "PaddingStatistics";
-
options.PerConnBWBurst = optionBandwith "PerConnBWBurst";
-
options.PerConnBWRate = optionBandwith "PerConnBWRate";
+
options.PerConnBWBurst = optionBandwidth "PerConnBWBurst";
+
options.PerConnBWRate = optionBandwidth "PerConnBWRate";
options.PidFile = optionPath "PidFile";
options.ProtocolWarnings = optionBool "ProtocolWarnings";
options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors";
···
options.ReducedExitPolicy = optionBool "ReducedExitPolicy";
options.RefuseUnknownExits = optionBool "RefuseUnknownExits"; # default is null and like "auto"
options.RejectPlaintextPorts = optionPorts "RejectPlaintextPorts";
-
options.RelayBandwidthBurst = optionBandwith "RelayBandwidthBurst";
-
options.RelayBandwidthRate = optionBandwith "RelayBandwidthRate";
+
options.RelayBandwidthBurst = optionBandwidth "RelayBandwidthBurst";
+
options.RelayBandwidthRate = optionBandwidth "RelayBandwidthRate";
#options.RunAsDaemon
options.Sandbox = optionBool "Sandbox";
options.ServerDNSAllowBrokenConfig = optionBool "ServerDNSAllowBrokenConfig";
+2 -2
nixos/modules/services/security/usbguard.nix
···
description = lib.mdDoc ''
The USBGuard daemon modifies some attributes of controller
devices like the default authorization state of new child device
-
instances. Using this setting, you can controll whether the daemon
+
instances. Using this setting, you can control whether the daemon
will try to restore the attribute values to the state before
-
modificaton on shutdown.
+
modification on shutdown.
'';
};
+1 -1
nixos/modules/services/system/cloud-init.nix
···
This configuration is not completely compatible with the
NixOS way of doing configuration, as configuration done by
-
cloud-init might be overriden by a subsequent nixos-rebuild
+
cloud-init might be overridden by a subsequent nixos-rebuild
call. However, some parts of cloud-init fall outside of
NixOS's responsibility, like filesystem resizing and ssh
public key provisioning, and cloud-init is useful for that
+1 -1
nixos/modules/services/system/kerberos/default.nix
···
###### interface
options = {
services.kerberos_server = {
-
enable = lib.mkEnableOption (lib.mdDoc "the kerberos authentification server");
+
enable = lib.mkEnableOption (lib.mdDoc "the kerberos authentication server");
realms = mkOption {
type = types.attrsOf (types.submodule realm);
+2 -2
nixos/modules/services/torrent/deluge.nix
···
`true`. String values must be quoted, integer and
boolean values must not. See
<https://git.deluge-torrent.org/deluge/tree/deluge/core/preferencesmanager.py#n41>
-
for the availaible options.
+
for the available options.
'';
};
···
when {option}`services.deluge.declarative` is set to
`true`.
See <https://dev.deluge-torrent.org/wiki/UserGuide/Authentication> for
-
more informations.
+
more information.
'';
};
+1 -1
nixos/modules/services/torrent/magnetico.nix
···
The path to the file holding the credentials to access the web
interface. If unset no authentication will be required.
-
The file must constain user names and password hashes in the format
+
The file must contain user names and password hashes in the format
`username:hash `, one for each line. Usernames must
start with a lowecase ([a-z]) ASCII character, might contain
non-consecutive underscores except at the end, and consists of
+1 -1
nixos/modules/services/torrent/rtorrent.nix
···
type = types.lines;
default = "";
description = lib.mdDoc ''
-
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.
+
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.
'';
};
};
+2 -2
nixos/modules/services/torrent/transmission.nix
···
(each time the service starts).
See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files)
-
for documentation of settings not explicitely covered by this module.
+
for documentation of settings not explicitly covered by this module.
'';
default = {};
type = types.submodule {
···
PrivateUsers = true;
ProtectClock = true;
ProtectControlGroups = true;
-
# ProtectHome=true would not allow BindPaths= to work accross /home,
+
# ProtectHome=true would not allow BindPaths= to work across /home,
# and ProtectHome=tmpfs would break statfs(),
# preventing transmission-daemon to report the available free space.
# However, RootDirectory= is used, so this is not a security concern
+1 -1
nixos/modules/services/video/unifi-video.nix
···
default = 1024;
example = 4096;
description = lib.mdDoc ''
-
Set the maximimum heap size for the JVM in MB.
+
Set the maximum heap size for the JVM in MB.
'';
};
+1 -1
nixos/modules/services/web-apps/bookstack.nix
···
};
systemd.services.bookstack-setup = {
-
description = "Preperation tasks for BookStack";
+
description = "Preparation tasks for BookStack";
before = [ "phpfpm-bookstack.service" ];
after = optional db.createLocally "mysql.service";
wantedBy = [ "multi-user.target" ];
+1 -1
nixos/modules/services/web-apps/healthchecks.nix
···
description = lib.mdDoc ''
Environment variables which are read by healthchecks `(local)_settings.py`.
-
Settings which are explictly covered in options bewlow, are type-checked and/or transformed
+
Settings which are explicitly covered in options bewlow, are type-checked and/or transformed
before added to the environment, everything else is passed as a string.
See <https://healthchecks.io/docs/self_hosted_configuration/>
+1 -1
nixos/modules/services/web-apps/ihatemoney/default.nix
···
example = {
http = ":8000";
};
-
description = lib.mdDoc "Additionnal configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen.";
+
description = lib.mdDoc "Additional configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen.";
};
defaultSender = {
name = mkOption {
+1 -1
nixos/modules/services/web-apps/invidious.nix
···
description = lib.mdDoc ''
A file including Invidious settings.
-
It gets merged with the setttings specified in {option}`services.invidious.settings`
+
It gets merged with the settings specified in {option}`services.invidious.settings`
and can be used to store secrets like `hmac_key` outside of the nix store.
'';
};
+1 -1
nixos/modules/services/web-apps/invoiceplane.nix
···
type = types.path;
default = "/var/lib/invoiceplane/${name}";
description = lib.mdDoc ''
-
This directory is used for uploads of attachements and cache.
+
This directory is used for uploads of attachments and cache.
The directory passed here is automatically created and permissions
adjusted as required.
'';
+1 -1
nixos/modules/services/web-apps/jitsi-meet.nix
···
'');
# Essential config - it's probably not good to have these as option default because
-
# types.attrs doesn't do merging. Let's merge explicitly, can still be overriden if
+
# types.attrs doesn't do merging. Let's merge explicitly, can still be overridden if
# user desires.
defaultCfg = {
hosts = {
+1 -1
nixos/modules/services/web-apps/matomo.nix
···
CURRENT_PACKAGE=$(readlink ${dataDir}/current-package)
NEW_PACKAGE=${cfg.package}
if [ "$CURRENT_PACKAGE" != "$NEW_PACKAGE" ]; then
-
# keeping tmp arround between upgrades seems to bork stuff, so delete it
+
# keeping tmp around between upgrades seems to bork stuff, so delete it
rm -rf ${dataDir}/tmp
fi
elif [ -e ${dataDir}/tmp ]; then
+1 -1
nixos/modules/services/web-apps/mattermost.nix
···
type = types.attrs;
default = { };
description = lib.mdDoc ''
-
Addtional configuration options as Nix attribute set in config.json schema.
+
Additional configuration options as Nix attribute set in config.json schema.
'';
};
+1 -1
nixos/modules/services/web-apps/mediawiki.nix
···
## Set $wgCacheDirectory to a writable directory on the web server
## to make your wiki go slightly faster. The directory should not
-
## be publically accessible from the web.
+
## be publicly accessible from the web.
$wgCacheDirectory = "${cacheDir}";
# Site language code, should be one of the list in ./languages/data/Names.php
+1 -1
nixos/modules/services/web-apps/netbox.nix
···
type = types.path;
default = "";
description = lib.mdDoc ''
-
Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`.
+
Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.
See the [documentation](https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration) for possible options.
'';
};
+7 -7
nixos/modules/services/web-apps/nextcloud.nix
···
# disable default openssl extension
(lib.filter (e: e.pname != "php-openssl") enabled)
# use OpenSSL 1.1 for RC4 Nextcloud encryption if user
-
# has acknowledged the brokeness of the ciphers (RC4).
+
# has acknowledged the brokenness of the ciphers (RC4).
# TODO: remove when https://github.com/nextcloud/server/issues/32003 is fixed.
++ (if cfg.enableBrokenCiphersForSSE then [ cfg.phpPackage.extensions.openssl-legacy ] else [ cfg.phpPackage.extensions.openssl ])
++ optional cfg.enableImagemagick imagick
···
* setting `listen.owner` & `listen.group` in the phpfpm-pool to a different value
Further details about this can be found in the `Nextcloud`-section of the NixOS-manual
-
(which can be openend e.g. by running `nixos-help`).
+
(which can be opened e.g. by running `nixos-help`).
'')
(mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] ''
Use services.nextcloud.nginx.enableImagemagick instead.
···
default = [];
description = lib.mdDoc ''
Trusted domains, from which the nextcloud installation will be
-
acessible. You don't need to add
+
accessible. You don't need to add
`services.nextcloud.hostname` here.
'';
};
···
services.nextcloud.enableBrokenCiphersForSSE = false;
-
If you need to use server-side encryption you can ignore this waring.
+
If you need to use server-side encryption you can ignore this warning.
Otherwise you'd have to disable server-side encryption first in order
to be able to safely disable this option and get rid of this warning.
See <https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html#disabling-encryption> on how to achieve this.
···
nextcloud-setup = let
c = cfg.config;
-
writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
+
writePhpArray = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]";
requiresReadSecretFunction = c.dbpassFile != null || c.objectstore.s3.enable;
objectstoreConfig = let s3 = c.objectstore.s3; in optionalString s3.enable ''
'objectstore' => [
···
''
}
'dbtype' => '${c.dbtype}',
-
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
-
'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
+
'trusted_domains' => ${writePhpArray ([ cfg.hostName ] ++ c.extraTrustedDomains)},
+
'trusted_proxies' => ${writePhpArray (c.trustedProxies)},
${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"}
${objectstoreConfig}
+1 -1
nixos/modules/services/web-apps/nextcloud.xml
···
<para>
If major-releases will be abandoned by upstream, we should check first if those are needed
-
in NixOS for a safe upgrade-path before removing those. In that case we shold keep those
+
in NixOS for a safe upgrade-path before removing those. In that case we should keep those
packages, but mark them as insecure in an expression like this (in
<literal>&lt;nixpkgs/pkgs/servers/nextcloud/default.nix&gt;</literal>):
<programlisting>/* ... */
+1 -1
nixos/modules/services/web-apps/onlyoffice.nix
···
postgresName = mkOption {
type = types.str;
default = "onlyoffice";
-
description = lib.mdDoc "The name of databse OnlyOffice should user.";
+
description = lib.mdDoc "The name of database OnlyOffice should user.";
};
postgresPasswordFile = mkOption {
+1 -1
nixos/modules/services/web-apps/outline.nix
···
options = {
host = lib.mkOption {
type = lib.types.str;
-
description = lib.mdDoc "Host name or IP adress of the SMTP server.";
+
description = lib.mdDoc "Host name or IP address of the SMTP server.";
};
port = lib.mkOption {
type = lib.types.port;
+1 -1
nixos/modules/services/web-apps/peering-manager.nix
···
ldapConfigPath = mkOption {
type = types.path;
description = lib.mdDoc ''
-
Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`.
+
Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.
See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options.
'';
};
+1 -1
nixos/modules/services/web-apps/pgpkeyserver-lite.nix
···
defaultText = literalExpression "head config.${sksOpt.hkpAddress}";
type = types.str;
description = lib.mdDoc ''
-
Wich ip address the sks-keyserver is listening on.
+
Which IP address the sks-keyserver is listening on.
'';
};
+1 -1
nixos/modules/services/web-apps/snipe-it.nix
···
};
systemd.services.snipe-it-setup = {
-
description = "Preperation tasks for snipe-it";
+
description = "Preparation tasks for snipe-it";
before = [ "phpfpm-snipe-it.service" ];
after = optional db.createLocally "mysql.service";
wantedBy = [ "multi-user.target" ];
+1 -1
nixos/modules/services/web-apps/sogo.nix
···
Replacement-filepath mapping for sogo.conf.
Every key is replaced with the contents of the file specified as value.
-
In the example, every occurence of LDAP_BINDPW will be replaced with the text of the
+
In the example, every occurrence of LDAP_BINDPW will be replaced with the text of the
specified file.
'';
type = attrsOf str;
+1 -1
nixos/modules/services/web-apps/wiki-js.nix
···
default = null;
example = "/root/wiki-js.env";
description = lib.mdDoc ''
-
Environment fiel to inject e.g. secrets into the configuration.
+
Environment file to inject e.g. secrets into the configuration.
'';
};
+1 -1
nixos/modules/services/web-servers/agate.nix
···
type = types.listOf types.str;
description = lib.mdDoc ''
Domain name of this Gemini server, enables checking hostname and port
-
in requests. (multiple occurences means basic vhosts)
+
in requests. (multiple occurrences means basic vhosts)
'';
};
+1 -1
nixos/modules/services/web-servers/apache-httpd/vhost-options.nix
···
description = lib.mdDoc ''
Listen addresses for this virtual host.
-
Compared to `listen` this only sets the addreses
+
Compared to `listen` this only sets the addresses
and the ports are chosen automatically.
'';
default = [ "*" ];
+1 -1
nixos/modules/services/web-servers/keter/default.nix
···
# On deploy this will load our app, by moving it into the incoming dir
# If the bundle content changes, this will run again.
-
# Because the bundle content contains the nix path to the exectuable,
+
# Because the bundle content contains the nix path to the executable,
# we inherit nix based cache busting.
systemd.services.load-keter-bundle = {
description = "load keter bundle into incoming folder";
+3 -1
nixos/modules/services/web-servers/nginx/default.nix
···
${acmeLocation}
${optionalString (vhost.root != null) "root ${vhost.root};"}
${optionalString (vhost.globalRedirect != null) ''
-
return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
+
location / {
+
return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
+
}
''}
${optionalString hasSSL ''
ssl_certificate ${vhost.sslCertificate};
+2 -2
nixos/modules/services/web-servers/nginx/vhost-options.nix
···
description = lib.mdDoc ''
Listen addresses for this virtual host.
-
Compared to `listen` this only sets the addreses
-
and the ports are choosen automatically.
+
Compared to `listen` this only sets the addresses
+
and the ports are chosen automatically.
Note: This option overrides `enableIPv6`
'';
+1 -1
nixos/modules/services/web-servers/ttyd.nix
···
assertions =
[ { assertion = cfg.enableSSL
-> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null;
-
message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specefied."; }
+
message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specified."; }
{ assertion = ! (cfg.interface != null && cfg.socket != null);
message = "Cannot set both interface and socket for ttyd."; }
{ assertion = (cfg.username != null) == (cfg.passwordFile != null);
+1 -1
nixos/modules/services/web-servers/zope2.nix
···
};
}
'';
-
description = lib.mdDoc "zope2 instances to be created automaticaly by the system.";
+
description = lib.mdDoc "zope2 instances to be created automatically by the system.";
};
};
+1 -1
nixos/modules/services/x11/display-managers/sddm.nix
···
};
};
description = lib.mdDoc ''
-
Extra settings merged in and overwritting defaults in sddm.conf.
+
Extra settings merged in and overwriting defaults in sddm.conf.
'';
};
+1 -1
nixos/modules/services/x11/hardware/libinput.nix
···
lib.mdDoc ''
Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap-
and-drag will not immediately release the button. If the finger is set down again within the
-
timeout, the draging process continues.
+
timeout, the dragging process continues.
'';
};
+2 -2
nixos/modules/services/x11/imwheel.nix
···
Window class translation rules.
/etc/X11/imwheelrc is generated based on this config
which means this config is global for all users.
-
See [offical man pages](http://imwheel.sourceforge.net/imwheel.1.html)
-
for more informations.
+
See [official man pages](http://imwheel.sourceforge.net/imwheel.1.html)
+
for more information.
'';
};
};
+1 -1
nixos/modules/services/x11/xautolock.nix
···
type = types.nullOr types.str;
description = lib.mdDoc ''
-
The script to use when nothing has happend for as long as {option}`killtime`
+
The script to use when nothing has happened for as long as {option}`killtime`
'';
};
+1 -1
nixos/modules/virtualisation/appvm.nix
···
user = mkOption {
type = types.str;
description = lib.mdDoc ''
-
AppVM user login. Currenly only AppVMs are supported for a single user only.
+
AppVM user login. Currently only AppVMs are supported for a single user only.
'';
};
};
+1 -1
nixos/modules/virtualisation/proxmox-image.nix
···
default = "local-lvm:vm-9999-disk-0";
example = "ceph:vm-123-disk-0";
description = lib.mdDoc ''
-
Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target sotrage.
+
Configuration for the default virtio disk. It can be used as a cue for PVE to autodetect the target storage.
This parameter is required by PVE even if it isn't used.
'';
};
+1 -1
nixos/modules/virtualisation/vmware-host.nix
···
# Services
systemd.services."vmware-authdlauncher" = {
-
description = "VMware Authentification Daemon";
+
description = "VMware Authentication Daemon";
serviceConfig = {
Type = "forking";
ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ];
+1 -1
nixos/tests/acme.nix
···
};
};
-
# Test compatiblity with Caddy
+
# Test compatibility with Caddy
# It only supports useACMEHost, hence not using mkServerConfigs
} // (let
baseCaddyConfig = { nodes, config, ... }: {
+1
nixos/tests/all-tests.nix
···
nginx = handleTest ./nginx.nix {};
nginx-auth = handleTest ./nginx-auth.nix {};
nginx-etag = handleTest ./nginx-etag.nix {};
+
nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};
nginx-http3 = handleTest ./nginx-http3.nix {};
nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};
nginx-njs = handleTest ./nginx-njs.nix {};
+1 -1
nixos/tests/cockroachdb.nix
···
# Cluster joins that are outside this window will fail, and nodes that skew
# outside the window after joining will promptly get kicked out.
#
-
# To accomodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
+
# To accommodate this, we use QEMU/virtio infrastructure and load the 'ptp_kvm'
# driver inside a guest. This driver allows the host machine to pass its clock
# through to the guest as a hardware clock that appears as a Precision Time
# Protocol (PTP) Clock device, generally /dev/ptp0. PTP devices can be measured
+1 -1
nixos/tests/common/ec2.nix
···
# Note: we use net=169.0.0.0/8 rather than
# net=169.254.0.0/16 to prevent dhcpcd from getting horribly
# confused. (It would get a DHCP lease in the 169.254.*
-
# range, which it would then configure and prompty delete
+
# range, which it would then configure and promptly delete
# again when it deletes link-local addresses.) Ideally we'd
# turn off the DHCP server, but qemu does not have an option
# to do that.
+1 -1
nixos/tests/graphite.nix
···
'';
};
carbon.enableCache = true;
-
seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure
+
seyren.enable = false; # Implicitly requires openssl-1.0.2u which is marked insecure
};
};
};
+1 -1
nixos/tests/home-assistant.nix
···
start_all()
# Parse the package path out of the systemd unit, as we cannot
-
# access the final package, that is overriden inside the module,
+
# access the final package, that is overridden inside the module,
# by any other means.
pattern = re.compile(r"path=(?P<path>[\/a-z0-9-.]+)\/bin\/hass")
response = hass.execute("systemctl show -p ExecStart home-assistant.service")[1]
+1 -1
nixos/tests/networking-proxy.nix
···
default-config //
{
networking.proxy = {
-
# useless because overriden by the next options
+
# useless because overridden by the next options
default = "http://user:pass@host:port";
# advanced proxy setup
httpProxy = "123-http://user:pass@http-host:port";
+24
nixos/tests/nginx-globalredirect.nix
···
+
import ./make-test-python.nix ({ pkgs, ... }: {
+
name = "nginx-globalredirect";
+
+
nodes = {
+
webserver = { pkgs, lib, ... }: {
+
services.nginx = {
+
enable = true;
+
virtualHosts.localhost = {
+
globalRedirect = "other.example.com";
+
# Add an exception
+
locations."/noredirect".return = "200 'foo'";
+
};
+
};
+
};
+
};
+
+
testScript = ''
+
webserver.wait_for_unit("nginx")
+
webserver.wait_for_open_port(80)
+
+
webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")
+
webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")
+
'';
+
})
+1 -1
nixos/tests/pgadmin4-standalone.nix
···
import ./make-test-python.nix ({ pkgs, lib, ... }:
-
# This is seperate from pgadmin4 since we don't want both running at once
+
# This is separate from pgadmin4 since we don't want both running at once
{
name = "pgadmin4-standalone";
+1 -1
nixos/tests/pgadmin4.nix
···
&& sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
)
-
# Don't bother to test LDAP or kerberos authentification
+
# Don't bother to test LDAP or kerberos authentication
with subtest("run browser test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
+1 -1
nixos/tests/vaultwarden.nix
···
with subtest("configure the cli"):
client.succeed("bw --nointeraction config server http://server")
-
with subtest("can't login to nonexistant account"):
+
with subtest("can't login to nonexistent account"):
client.fail(
"bw --nointeraction --raw login ${userEmail} ${userPassword}"
)
-1
pkgs/applications/audio/mopidy/local.nix
···
];
meta = with lib; {
-
broken = stdenv.isDarwin;
homepage = "https://github.com/mopidy/mopidy-local";
description = "Mopidy extension for playing music from your local music archive";
license = licenses.asl20;
-1
pkgs/applications/audio/mopidy/musicbox-webclient.nix
···
meta = with lib; {
description = "Mopidy extension for playing music from SoundCloud";
license = licenses.mit;
-
broken = stdenv.isDarwin;
maintainers = [ maintainers.spwhitt ];
};
}
+1 -1
pkgs/applications/audio/mp3val/default.nix
···
files' integrity. It can be useful for finding corrupted files (e.g.
incompletely downloaded, truncated, containing garbage). MP3val is
also able to fix most of the problems. Being a multiplatform application,
-
MP3val can be runned both under Windows and under Linux (or BSD). The most
+
MP3val can be run both under Windows and under Linux (or BSD). The most
common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports
also other MPEG versions and layers. The tool is also aware of the most
common types of tags (ID3v1, ID3v2, APEv2).
+3 -3
pkgs/applications/editors/kakoune/plugins/aliases.nix
···
# Deprecated aliases - for backward compatibility
-
lib: overriden:
+
lib: overridden:
-
with overriden;
+
with overridden;
let
# Removing recurseForDerivation prevents derivations of aliased attribute
···
# Make sure that we are not shadowing something from
# all-packages.nix.
-
checkInPkgs = n: alias: if builtins.hasAttr n overriden
+
checkInPkgs = n: alias: if builtins.hasAttr n overridden
then throw "Alias ${n} is still in kakounePlugins"
else alias;
+2 -2
pkgs/applications/emulators/citra/update.sh
···
NEW_NIGHTLY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "nightly-${NEW_NIGHTLY_VERSION}" "https://github.com/citra-emu/citra-nightly" | jq -r '.sha256')"
-
echo " Succesfully fetched. hash: ${NEW_NIGHTLY_HASH}"
+
echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}"
sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix
sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix
···
NEW_CANARY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "canary-${NEW_CANARY_VERSION}" "https://github.com/citra-emu/citra-canary" | jq -r '.sha256')"
-
echo " Succesfully fetched. hash: ${NEW_CANARY_HASH}"
+
echo " Successfully fetched. hash: ${NEW_CANARY_HASH}"
sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix
sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix
+2 -2
pkgs/applications/emulators/yuzu/update.sh
···
sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX"
sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
-
echo " succesfully updated $attribute. new hash: $newHash"
+
echo " successfully updated $attribute. new hash: $newHash"
}
updateCompatibilityList() {
···
sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX"
sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX"
-
echo " succesfully updated compatibility_list. new hash: $newHash"
+
echo " successfully updated compatibility_list. new hash: $newHash"
}
if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then
+3 -3
pkgs/applications/misc/ipmiview/default.nix
···
stdenv.mkDerivation rec {
pname = "IPMIView";
-
version = "2.20.0";
-
buildVersion = "220309";
+
version = "2.21.0";
+
buildVersion = "221118";
src = fetchurl {
url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
-
hash = "sha256-qtklBMuK0jb9Ye0IkYM2WYFRMAfZg9tk08a1JQ64cjA=";
+
hash = "sha256-ZN0vadGbjGj9U2wPqvHLjS9fsk3DNCbXoNvzUfnn8IM=";
};
nativeBuildInputs = [ patchelf makeWrapper ];
+1 -1
pkgs/applications/misc/with-shell/default.nix
···
$ with git
git> add .
-
git> commit -a -m "Commited"
+
git> commit -a -m "Committed"
git> push
Can also be used for compound commands.
+1 -2
pkgs/applications/networking/browsers/vivaldi/default.nix
···
, isSnapshot ? false
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
, enableWidevine ? false, vivaldi-widevine ? null
-
, forceDarkMode ? false
, commandLineArgs ? ""
, pulseSupport ? stdenv.isLinux, libpulseaudio
}:
···
substituteInPlace "$out"/share/applications/*.desktop \
--replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi
substituteInPlace "$out"/share/applications/*.desktop \
-
--replace vivaldi-stable "vivaldi ${lib.optionalString forceDarkMode "--force-dark-mode"}"
+
--replace vivaldi-stable vivaldi
local d
for d in 16 22 24 32 48 64 128 256; do
mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
+1 -1
pkgs/applications/networking/cluster/hadoop/default.nix
···
};
jdk = jdk8_headless;
# not using native libs because of broken openssl_1_0_2 dependency
-
# can be manually overriden
+
# can be manually overridden
tests = nixosTests.hadoop_3_2;
};
hadoop2 = common rec {
+1 -1
pkgs/applications/networking/mailreaders/mailnag/default.nix
···
, gsettings-desktop-schemas
, glib
, gobject-introspection
-
# Available plugins (can be overriden)
+
# Available plugins (can be overridden)
, availablePlugins
# Used in the withPlugins interface at passthru, can be overrided directly, or
# prefarably via e.g: `mailnag.withPlugins([mailnag.availablePlugins.goa])`
+1 -1
pkgs/applications/radio/gnuradio/3.8.nix
···
})
];
passthru = shared.passthru // {
-
# Deps that are potentially overriden and are used inside GR plugins - the same version must
+
# Deps that are potentially overridden and are used inside GR plugins - the same version must
inherit
boost
volk
+1 -1
pkgs/applications/radio/gnuradio/3.9.nix
···
./modtool-newmod-permissions.patch
];
passthru = shared.passthru // {
-
# Deps that are potentially overriden and are used inside GR plugins - the same version must
+
# Deps that are potentially overridden and are used inside GR plugins - the same version must
inherit
boost
volk
+1 -1
pkgs/applications/radio/gnuradio/default.nix
···
./modtool-newmod-permissions.patch
];
passthru = shared.passthru // {
-
# Deps that are potentially overriden and are used inside GR plugins - the same version must
+
# Deps that are potentially overridden and are used inside GR plugins - the same version must
inherit
boost
volk
+1 -1
pkgs/applications/radio/gnuradio/shared.nix
···
, features
, versionAttr
, sourceSha256
-
# If overriden. No need to set default values, as they are given defaults in
+
# If overridden. No need to set default values, as they are given defaults in
# the main expressions
, overrideSrc
, fetchFromGitHub
+2 -2
pkgs/applications/science/logic/cvc5/default.nix
···
stdenv.mkDerivation rec {
pname = "cvc5";
-
version = "1.0.2";
+
version = "1.0.3";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
-
sha256 = "sha256-RDslPz9b0R9NXaXoixSCenHEh+F3wg/8p4Ksrzh41PI=";
+
sha256 = "sha256-CVXK6yehfUrSbo8R1Dk1oc/siCtmV9DjEp6q+aLuVQA=";
};
nativeBuildInputs = [ pkg-config cmake ];
+1 -1
pkgs/applications/science/logic/monosat/default.nix
···
{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8,
-
# The JDK we use on Darwin currenly makes extensive use of rpaths which are
+
# The JDK we use on Darwin currently makes extensive use of rpaths which are
# annoying and break the python library, so let's not bother for now
includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }:
+1 -1
pkgs/applications/science/math/LiE/default.nix
···
longDescription = ''
LiE is a computer algebra system that is specialised in computations
involving (reductive) Lie groups and their representations. It is
-
publically available for free in source code. For a description of its
+
publicly available for free in source code. For a description of its
characteristics, we refer to the following sources of information.
''; # take from the website
+1 -1
pkgs/applications/science/molecular-dynamics/lammps/default.nix
···
for pack in ${lib.concatStringsSep " " packages}; do make "yes-$pack" SHELL=$SHELL; done
'';
-
# Must do manual build due to LAMMPS requiring a seperate build for
+
# Must do manual build due to LAMMPS requiring a separate build for
# the libraries and executable. Also non-typical make script
buildPhase = ''
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
···
# Fix issue with old sqlite3 version pinned that depends on very old node-gyp 3.x
${gnused}/bin/sed -i -e 's/"sqlite3":\s*"5.0.[0-9]\+"/"sqlite3": "5.0.11"/' package.json
-
# Regenerate node packages to update the pre-overriden epgstation derivation.
+
# Regenerate node packages to update the pre-overridden epgstation derivation.
# This must come *after* package.json has been regenerated.
pushd ../../../development/node-packages
./generate.sh
+1 -1
pkgs/applications/video/kodi/unwrapped.nix
···
, buildPackages
}:
-
assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
+
assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is available
assert gbmSupport || waylandSupport || x11Support;
let
+1 -1
pkgs/applications/window-managers/herbstluftwm/default.nix
···
python3.pkgs.pytestCheckHook
];
-
# make the package's module avalaible
+
# make the package's module available
preCheck = ''
export PYTHONPATH="$PYTHONPATH:../python"
'';
+1 -1
pkgs/build-support/docker/default.nix
···
contentsList = if builtins.isList contents then contents else [ contents ];
# We store the customisation layer as a tarball, to make sure that
-
# things like permissions set on 'extraCommands' are not overriden
+
# things like permissions set on 'extraCommands' are not overridden
# by Nix. Then we precompute the sha256 for performance.
customisationLayer = symlinkJoin {
name = "${baseName}-customisation-layer";
+1 -1
pkgs/build-support/dotnet/build-dotnet-module/default.nix
···
deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps;
};
-
# this contains all the nuget packages that are implictly referenced by the dotnet
+
# this contains all the nuget packages that are implicitly referenced by the dotnet
# build system. having them as separate deps allows us to avoid having to regenerate
# a packages dependencies when the dotnet-sdk version changes
sdkDeps = mkNugetDeps {
+1 -1
pkgs/build-support/fetchfirefoxaddon/tests.nix
···
url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg=";
};
-
overidden-source =
+
overridden-source =
let
image-search-options = fetchurl {
url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
+1 -1
pkgs/build-support/release/source-tarball.nix
···
stdenv.mkDerivation (
-
# First, attributes that can be overriden by the caller (via args):
+
# First, attributes that can be overridden by the caller (via args):
{
# By default, only configure and build a source distribution.
# Some packages can only build a distribution after a general
+1 -1
pkgs/build-support/rust/build-rust-crate/test/default.nix
···
expectedFiles = [
"./bin/test_binary1"
] ++ lib.optionals stdenv.isDarwin [
-
# On Darwin, the debug symbols are in a seperate directory.
+
# On Darwin, the debug symbols are in a separate directory.
"./bin/test_binary1.dSYM/Contents/Info.plist"
"./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
];
+1 -1
pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
···
/* Returns a crate which depends on successful test execution
of crate given as the second argument.
-
testCrateFlags: list of flags to pass to the test exectuable
+
testCrateFlags: list of flags to pass to the test executable
testInputs: list of packages that should be available during test execution
*/
crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
+1 -1
pkgs/build-support/vm/default.nix
···
of the default image parameters can be given. In particular,
`extraPackages' specifies the names of additional packages from
the distribution that should be included in the image; `packages'
-
allows the entire set of packages to be overriden; and `size'
+
allows the entire set of packages to be overridden; and `size'
sets the size of the disk in megabytes. E.g.,
`diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"];
size = 8192; }' builds an 8 GiB image containing Firefox in
+1 -1
pkgs/data/fonts/google-fonts/default.nix
···
pname = "google-fonts";
version = "unstable-2022-11-14";
-
# Adobe Blank is split out in a seperate output,
+
# Adobe Blank is split out in a separate output,
# because it causes crashes with `libfontconfig`.
# It has an absurd number of symbols
outputs = [ "out" "adobeBlank" ];
+1 -1
pkgs/data/fonts/profont/default.nix
···
version = "2019-11";
# Note: stripRoot doesn't work because the archive
-
# constains the metadata directory `__MACOSX`.
+
# contains the metadata directory `__MACOSX`.
src = fetchzip {
url = "https://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb";
+1 -1
pkgs/data/fonts/tamzen/default.nix
···
meta = with lib; {
description = "Bitmapped programming font based on Tamsyn";
longDescription = ''
-
Tamzen is a monospace bitmap font. It is programatically forked
+
Tamzen is a monospace bitmap font. It is programmatically forked
from Tamsyn version 1.11, which backports glyphs from older
versions while deleting deliberately empty glyphs to allow
secondary/fallback fonts to provide real glyphs at those codepoints.
+1 -1
pkgs/data/misc/cacert/update.sh
···
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix common-updater-scripts jq
-
# Build both the cacert package and an overriden version where we use the source attribute of NSS.
+
# Build both the cacert package and an overridden version where we use the source attribute of NSS.
# Cacert and NSS are both from the same upstream sources. They are decoupled as
# the cacert output only cares about a few infrequently changing files in the
# sources while the NSS source code changes frequently.
+1 -1
pkgs/desktops/enlightenment/efl/default.nix
···
mesonFlags = [
"--buildtype=release"
"-D build-tests=false" # disable build tests, which are not working
-
"-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs
+
"-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not available in nixpkgs
"-D embedded-lz4=false"
"-D fb=true"
"-D network-backend=connman"
+1 -1
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
···
# Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems.
#
# That is not possible within nixos, but we can achieve this easily with a simple script that copies
-
# them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session
+
# them. We then use a xdg autostart and initialize it during the "EarlyInitialization" phase of a gnome session
# which is most appropriate for installing files into $HOME.
#
+2 -2
pkgs/development/compilers/dotnet/update.sh
···
# would fail due to missing dependencies.
#
# Moving them to a separate list stored alongside the SDK package definitions,
-
# and implictly including them along in buildDotnetModule allows us
+
# and implicitly including them along in buildDotnetModule allows us
# to make updating .NET SDK packages a lot easier - we now just update
# the versions of these packages in one place, and all packages that
# use buildDotnetModule continue building with the new .NET version without changes.
···
# would fail due to missing dependencies.
#
# Moving them to a separate list stored alongside the SDK package definitions,
-
# and implictly including them along in buildDotnetModule allows us
+
# and implicitly including them along in buildDotnetModule allows us
# to make updating .NET SDK packages a lot easier - we now just update
# the versions of these packages in one place, and all packages that
# use buildDotnetModule continue building with the new .NET version without changes.
+1 -1
pkgs/development/compilers/elm/default.nix
···
let
-
# To controll nodejs version we pass down
+
# To control nodejs version we pass down
nodejs = pkgs.nodejs-14_x;
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
+1 -1
pkgs/development/compilers/gcc/4.9/default.nix
···
hardeningDisable = [ "format" "pie" ];
-
# When targetting darwin, libgcc_ext.10.{4,5}.dylib are created as
+
# When targeting darwin, libgcc_ext.10.{4,5}.dylib are created as
# MH_DYLIB_STUB files, which install_name_tool can't change, so we
# get a cycle between $out and $lib.
outputs = if langJava || langGo || targetPlatform.isDarwin then ["out" "man" "info"]
+1 -1
pkgs/development/compilers/graalvm/community-edition/mkGraal.nix
···
# };
# }
config
-
# GraalVM version that will be used unless overriden by `config.<platform>.version`
+
# GraalVM version that will be used unless overridden by `config.<platform>.version`
, defaultVersion
# Java version used by GraalVM
, javaVersion
+1 -1
pkgs/development/haskell-modules/lib/compose.nix
···
*/
triggerRebuild = i: overrideCabal (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
-
/* Override the sources for the package and optionaly the version.
+
/* Override the sources for the package and optionally the version.
This also takes of removing editedCabalFile.
*/
overrideSrc = { src, version ? null }: drv:
+1 -1
pkgs/development/haskell-modules/lib/default.nix
···
*/
triggerRebuild = drv: i: compose.triggerRebuild i drv;
-
/* Override the sources for the package and optionaly the version.
+
/* Override the sources for the package and optionally the version.
This also takes of removing editedCabalFile.
*/
overrideSrc = drv: src: compose.overrideSrc src drv;
+2 -2
pkgs/development/haskell-modules/make-package-set.nix
···
# `self` as second, and returns a set of haskell packages
package-set
-
, # The final, fully overriden package set usable with the nixpkgs fixpoint
+
, # The final, fully overridden package set usable with the nixpkgs fixpoint
# overriding functionality
extensible-self
}:
···
mkDerivation = makeOverridable mkDerivationImpl;
-
# manualArgs are the arguments that were explictly passed to `callPackage`, like:
+
# manualArgs are the arguments that were explicitly passed to `callPackage`, like:
#
# callPackage foo { bar = null; };
#
+2 -2
pkgs/development/interpreters/lua-5/default.nix
···
generatedPackages = if (builtins.pathExists ../../lua-modules/generated-packages.nix) then
(final: prev: callPackage ../../lua-modules/generated-packages.nix { inherit (final) callPackage; } final prev)
else (final: prev: {});
-
overridenPackages = callPackage ../../lua-modules/overrides.nix { };
+
overriddenPackages = callPackage ../../lua-modules/overrides.nix { };
otherSplices = {
selfBuildBuild = luaOnBuildForBuild.pkgs;
···
extra = spliced0: {};
extensions = lib.composeManyExtensions [
generatedPackages
-
overridenPackages
+
overriddenPackages
overrides
];
in lib.makeScopeWithSplicing
+2 -2
pkgs/development/interpreters/octave/default.nix
···
, blas, lapack
# These two should use the same lapack and blas as the above
, qrupdate, arpack, suitesparse ? null
-
# If set to true, the above 5 deps are overriden to use the blas and lapack
+
# If set to true, the above 5 deps are overridden to use the blas and lapack
# with 64 bit indexes support. If all are not compatible, the build will fail.
, use64BitIdx ? false
, libwebp
···
;
qrupdate' = qrupdate.override {
# If use64BitIdx is false, this override doesn't evaluate to a new
-
# derivation, as blas and lapack are not overriden.
+
# derivation, as blas and lapack are not overridden.
blas = blas';
lapack = lapack';
};
+1 -1
pkgs/development/interpreters/python/python-packages-base.nix
···
namePrefix = python.libPrefix + "-";
-
# Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.
+
# Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`.
# This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`.
makeOverridablePythonPackage = f: origArgs:
let
+1 -1
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
···
}
def _determine_fetcher(text):
-
# Count occurences of fetchers.
+
# Count occurrences of fetchers.
nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
if nfetchers == 0:
raise ValueError("no fetcher.")
+1 -1
pkgs/development/libraries/glib/default.nix
···
# $out/bin/gtester-report' to postInstall if this is solved
/*
* Use --enable-installed-tests for GNOME-related packages,
-
and use them as a separately installed tests runned by Hydra
+
and use them as a separately installed tests run by Hydra
(they should test an already installed package)
https://wiki.gnome.org/GnomeGoals/InstalledTests
* Support org.freedesktop.Application, including D-Bus activation from desktop files
+10 -10
pkgs/development/libraries/gobject-introspection/wrapper.nix
···
# passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override``
argsForTarget = builtins.removeAttrs args [ "stdenv" ];
-
overridenUnwrappedGir = gobject-introspection-unwrapped.override args;
+
overriddenUnwrappedGir = gobject-introspection-unwrapped.override args;
# if we have targetPackages.gobject-introspection then propagate that
overridenTargetUnwrappedGir =
if targetPackages ? gobject-introspection-unwrapped
then targetPackages.gobject-introspection-unwrapped.override argsForTarget
-
else overridenUnwrappedGir;
+
else overriddenUnwrappedGir;
in
# wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection
if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages
then
-
overridenUnwrappedGir.overrideAttrs
+
overriddenUnwrappedGir.overrideAttrs
(previousAttrs:
{
pname = "gobject-introspection-wrapped";
passthru = previousAttrs.passthru // {
-
unwrapped = overridenUnwrappedGir;
+
unwrapped = overriddenUnwrappedGir;
};
dontStrip = true;
depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
···
eval fixupPhase
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
-
${lib.getExe buildPackages.xorg.lndir} ${overridenUnwrappedGir.${output}} ${"$" + "${output}"}
-
'') overridenUnwrappedGir.outputs}
+
${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
+
'') overriddenUnwrappedGir.outputs}
cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped
cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped
···
'';
})
else
-
overridenUnwrappedGir.overrideAttrs (previousAttrs:
+
overriddenUnwrappedGir.overrideAttrs (previousAttrs:
{
pname = "gobject-introspection-wrapped";
passthru = previousAttrs.passthru // {
-
unwrapped = overridenUnwrappedGir;
+
unwrapped = overriddenUnwrappedGir;
};
dontStrip = true;
depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
···
eval fixupPhase
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
-
${lib.getExe buildPackages.xorg.lndir} ${overridenUnwrappedGir.${output}} ${"$" + "${output}"}
-
'') overridenUnwrappedGir.outputs}
+
${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
+
'') overriddenUnwrappedGir.outputs}
'';
})
+1 -1
pkgs/development/libraries/gstreamer/good/default.nix
···
# fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
doCheck = false;
-
# must be explicitely set since 5590e365
+
# must be explicitly set since 5590e365
dontWrapQtApps = true;
meta = with lib; {
+1 -1
pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
···
buildInputs = [ opencl-headers ];
meta = with lib; {
-
description = "Offical Khronos OpenCL ICD Loader";
+
description = "Official Khronos OpenCL ICD Loader";
homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
license = licenses.asl20;
platforms = platforms.linux;
+1 -1
pkgs/development/libraries/libcommuni/default.nix
···
dontUseQmakeConfigure = true;
configureFlags = [ "-config" "release" ]
-
# Build mixes up dylibs/frameworks if one is not explicitely specified.
+
# Build mixes up dylibs/frameworks if one is not explicitly specified.
++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ];
dontWrapQtApps = true;
+1 -1
pkgs/development/libraries/ndn-cxx/default.nix
···
meta = with lib; {
homepage = "https://named-data.net/";
-
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
+
description = "A Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction";
longDescription = ''
ndn-cxx is a C++ library, implementing Named Data Networking (NDN)
primitives that can be used to implement various NDN applications.
+1 -1
pkgs/development/libraries/science/math/blas/default.nix
···
{ lib, stdenv, fetchurl, cmake, gfortran
-
# Wether to build with ILP64 interface
+
# Whether to build with ILP64 interface
, blas64 ? false
}:
+1 -1
pkgs/development/libraries/science/math/zn_poly/default.nix
···
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-
# Tuning (either autotuning or with hand-written paramters) is possible
+
# Tuning (either autotuning or with hand-written parameters) is possible
# but not implemented here.
# It seems buggy anyways (see homepage).
buildFlags = [ "all" "${libbasename}${libext}" ];
+1 -1
pkgs/development/libraries/stargate-libcds/default.nix
···
PLAT_FLAGS = lib.optionalString stdenv.isx86_64 "-mfpmath=sse -mssse3";
patches = [
-
# Remove unecessary tests (valgrind, coverage)
+
# Remove unnecessary tests (valgrind, coverage)
./Makefile.patch
# Fix for building on darwin
+1 -1
pkgs/development/libraries/vulkan-headers/default.nix
···
meta = with lib; {
description = "Vulkan Header files and API registry";
homepage = "https://www.lunarg.com";
-
platforms = platforms.unix;
+
platforms = platforms.unix ++ platforms.windows;
license = licenses.asl20;
maintainers = [ maintainers.ralith ];
};
+1 -1
pkgs/development/octave-modules/vibes/default.nix
···
VIBes API that enables your program to communicate with the viewer in order
to draw figures. This package integrates the VIBes API into Octave. The
VIBes application is required for operation and must be installed
-
seperately. Data types from third-party interval arithmetic libraries for
+
separately. Data types from third-party interval arithmetic libraries for
Octave are also supported.
'';
# Marked this way until KarlJoad gets around to packaging the vibes program.
+8 -7
pkgs/development/python-modules/awacs/default.nix
···
, fetchPypi
, pythonOlder
, python
-
-
# python dependencies
, typing-extensions
}:
buildPythonPackage rec {
pname = "awacs";
-
version = "2.2.0";
+
version = "2.3.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-zWRQHxjHogmSKSqnvQLJCdoilkOlJ07p00lN+U46WkU=";
+
hash = "sha256-0tizZWcHe1qbLxpXS/IngExaFFUHZyXXlksWcNL/vEw=";
};
propagatedBuildInputs = lib.lists.optionals (pythonOlder "3.8") [
···
${python.interpreter} -m unittest discover
'';
-
pythonImportsCheck = [ "awacs" ];
+
pythonImportsCheck = [
+
"awacs"
+
];
meta = with lib; {
description = "AWS Access Policy Language creation library";
-
maintainers = with maintainers; [ jlesquembre ];
+
homepage = "https://github.com/cloudtools/awacs";
+
changelog = "https://github.com/cloudtools/awacs/blob/${version}/CHANGELOG.md";
license = licenses.bsd2;
-
homepage = "https://github.com/cloudtools/awacs";
+
maintainers = with maintainers; [ jlesquembre ];
};
}
+2 -2
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
···
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
-
version = "20.7.0";
+
version = "21.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
···
src = fetchPypi {
inherit pname version;
extension = "zip";
-
hash = "sha256-tNuBIfObCWd8JXq49CDLOzMl1pw7ulTQJua7CNJjRuo=";
+
hash = "sha256-9Jhhd/qmphNnmWphXtFr6V52WA7KtKA8lI6cKsdGsOE=";
};
propagatedBuildInputs = [
+1 -1
pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix
···
pname = "backports.shutil_get_terminal_size";
version = "unstable-2016-02-21";
-
# there have been numerous fixes commited since the initial release.
+
# there have been numerous fixes committed since the initial release.
# Most notably fixing a problem where the backport would always return
# terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5.
# Unfortunately the maintainer seems inactive and has not responded to
+1 -1
pkgs/development/python-modules/beancount_docverif/default.nix
···
Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions:
- Require that every transaction touching an account have an accompanying document on disk.
-
- Explictly declare the name of a document accompanying a transaction.
+
- Explicitly declare the name of a document accompanying a transaction.
- Explicitly declare that a transaction is expected not to have an accompanying document.
- Look for an "implicit" PDF document matching transaction data.
- Associate (and require) a document with any type of entry, including open entries themselves.
+1 -1
pkgs/development/python-modules/buildbot/plugins.nix
···
sha256 = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0=";
};
-
# Remove unneccessary circular dependency on buildbot
+
# Remove unnecessary circular dependency on buildbot
postPatch = ''
sed -i "s/'buildbot'//" setup.py
'';
-5
pkgs/development/python-modules/cleo/default.nix
···
hash = "sha256-y9PYlGSPLpZl9Ad2AFuDKIopH0LRETLp35aiZtLcXzM=";
};
-
postPatch = ''
-
substituteInPlace pyproject.toml \
-
--replace 'crashtest = "^0.3.1"' 'crashtest = "*"'
-
'';
-
nativeBuildInputs = [
poetry-core
];
+2 -2
pkgs/development/python-modules/dj-database-url/default.nix
···
buildPythonPackage rec {
pname = "dj-database-url";
-
version = "1.0.0";
+
version = "1.2.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w=";
+
hash = "sha256-sjsVBGyzgYDgyVIHvMkP5enb3o7vFgZZB92Fz0ynA2w=";
};
propagatedBuildInputs = [
+3 -2
pkgs/development/python-modules/duckdb-engine/default.nix
···
buildPythonPackage rec {
pname = "duckdb-engine";
-
version = "0.6.5";
+
version = "0.6.6";
format = "pyproject";
disabled = pythonOlder "3.7";
···
repo = "duckdb_engine";
owner = "Mause";
rev = "refs/tags/v${version}";
-
hash = "sha256-DLm/8bye8p2fhs36CW5PQAxm3uhJq1L+DT1Zn2uJhqE=";
+
hash = "sha256-OpVkMkZt5h4Rp615wx42cR/NFbv6dwsklqM8/xRswtw=";
};
nativeBuildInputs = [
···
meta = with lib; {
description = "SQLAlchemy driver for duckdb";
homepage = "https://github.com/Mause/duckdb_engine";
+
changelog = "https://github.com/Mause/duckdb_engine/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
+1 -1
pkgs/development/python-modules/ignite/default.nix
···
checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
propagatedBuildInputs = [ packaging torch scikit-learn tqdm ];
-
# runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
+
# runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
doCheck = pythonOlder "3.9";
# Some packages are not in NixPkgs; other tests try to build distributed
+1 -1
pkgs/development/python-modules/mezzanine/default.nix
···
# Tests Fail Due to Syntax Warning, Fixed for v3.1.11+
doCheck = false;
-
# sed calls will be unecessary in v3.1.11+
+
# sed calls will be unnecessary in v3.1.11+
preConfigure = ''
sed -i 's/==/>=/' setup.py
'';
+1 -1
pkgs/development/python-modules/mouseinfo/default.nix
···
];
doCheck = false;
-
# Mouseinfo requires a X server running to import succesfully
+
# Mouseinfo requires a X server running to import successfully
# pythonImportsCheck = [ "mouseinfo" ];
propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/pyoverkiz/default.nix
···
buildPythonPackage rec {
pname = "pyoverkiz";
-
version = "1.7.2";
+
version = "1.7.3";
format = "pyproject";
disabled = pythonOlder "3.7";
···
owner = "iMicknl";
repo = "python-overkiz-api";
rev = "refs/tags/v${version}";
-
hash = "sha256-9/xdFwf+r2z166w/4VIj31MahDWmaMdWLfTGot+RoYQ=";
+
hash = "sha256-hmi6cOBHbcxzA10vQt6fxB8qHrr4My5JFmucV5QCUVg=";
};
postPatch = ''
+3 -2
pkgs/development/python-modules/sphinxcontrib-katex/default.nix
···
buildPythonPackage rec {
pname = "sphinxcontrib-katex";
-
version = "0.9.0";
+
version = "0.9.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-HFs1+9tWl1D5VWY14dPCk+Ewv+ubedhd9DcCSrPQZnQ=";
+
hash = "sha256-6IUTUc4HOK2e++3qMfT2MVm+cBnfVyohSiyROtiRGzI=";
};
propagatedBuildInputs = [
···
meta = with lib; {
description = "Sphinx extension using KaTeX to render math in HTML";
homepage = "https://github.com/hagenw/sphinxcontrib-katex";
+
changelog = "https://github.com/hagenw/sphinxcontrib-katex/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ jluttine ];
};
+1 -1
pkgs/development/python-modules/stone/default.nix
···
checkInputs = [ pytestCheckHook mock ];
# try to import from `test` directory, which is exported by the python interpreter
-
# and cannot be overriden without removing some py3 to py2 support
+
# and cannot be overridden without removing some py3 to py2 support
disabledTestPaths = [
"test/test_tsd_types.py"
"test/test_js_client.py"
+1 -1
pkgs/development/ruby-modules/gem-config/default.nix
···
# gems that don't behave correctly, fixes are already provided in the form of
# derivations.
#
-
# This seperates "what to build" (the exact gem versions) from "how to build"
+
# This separates "what to build" (the exact gem versions) from "how to build"
# (to make gems behave if necessary).
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
+1 -1
pkgs/development/tools/continuous-integration/github-runner/default.nix
···
# Script to create deps.nix file for dotnet dependencies. Run it with
# $(nix-build -A github-runner.passthru.createDepsFile)/bin/create-deps-file
#
-
# Default output path is /tmp/${pname}-deps.nix, but can be overriden with cli argument.
+
# Default output path is /tmp/${pname}-deps.nix, but can be overridden with cli argument.
#
# Inspired by passthru.fetch-deps in pkgs/build-support/build-dotnet-module/default.nix
passthru.createDepsFile = writeShellApplication {
+1 -1
pkgs/development/tools/misc/binutils/2.38/default.nix
···
# Turn on --enable-new-dtags by default to make the linker set
# RUNPATH instead of RPATH on binaries. This is important because
-
# RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
+
# RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
"--enable-new-dtags"
# force target prefix. Some versions of binutils will make it empty if
+1 -1
pkgs/development/tools/misc/binutils/default.nix
···
# Turn on --enable-new-dtags by default to make the linker set
# RUNPATH instead of RPATH on binaries. This is important because
-
# RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
+
# RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
"--enable-new-dtags"
# force target prefix. Some versions of binutils will make it empty if
+1 -1
pkgs/development/tools/misc/dura/default.nix
···
];
meta = with lib; {
-
description = "A background process that saves uncommited changes on git";
+
description = "A background process that saves uncommitted changes on git";
longDescription = ''
Dura is a background process that watches your Git repositories and
commits your uncommitted changes without impacting HEAD, the current
+2 -2
pkgs/development/tools/misc/strace/default.nix
···
stdenv.mkDerivation rec {
pname = "strace";
-
version = "6.0";
+
version = "6.1";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-
sha256 = "sha256-ktcgpmaFXp8cahFRL9bplnSoK7/hRCVXgV8s6OEpMzg=";
+
sha256 = "sha256-JXnpzsN9u3hvbqC+vRX0DdVh7yveKiouzc5ZY7AYWf0=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
+1 -1
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
···
/*
The default list of poetry2nix override overlays
-
Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function
+
Can be overridden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function
*/
defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib poetryLib; });
+1 -1
pkgs/development/tools/tapview/default.nix
···
sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g=";
};
-
# Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected.
+
# Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected.
patches = [ ./dont_check_echo.patch ];
makeFlags = [ "prefix=$(out)" ];
+1 -1
pkgs/games/gl-gsync-demo/default.nix
···
maintainers = with maintainers; [ atemu ];
description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux";
longDescription = ''
-
The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate.
+
The demo simply draws a vertical bar moving across the screen at constant speed, but deliberately rendered at a variable frame rate.
The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps.
+1 -1
pkgs/games/openra/default.nix
···
let
/* Building an engine or out-of-tree mod is very similar,
but different enough not to be able to build them with the same package definition,
-
so instaed we define what is common between them in a seperate file.
+
so instaed we define what is common between them in a separate file.
Although `callPackage` could be used, it would require undoing `makeOverridable`,
because `common.nix` does not define a package, but just an attribute set,
+1 -1
pkgs/games/openra/packages.nix
···
let
/* Building an engine or out-of-tree mod is very similar,
but different enough not to be able to build them with the same package definition,
-
so instaed we define what is common between them in a seperate file.
+
so instaed we define what is common between them in a separate file.
Although `callPackage` could be used, it would require undoing `makeOverridable`,
because `common.nix` does not define a package, but just an attribute set,
+9 -3
pkgs/misc/dxvk/default.nix
···
# platforms diverge (due to the need for Darwin-specific patches that would fail to apply).
# Should that happen, set `darwin` to the last working `rev` and `hash`.
srcs = rec {
-
darwin = { inherit (default) rev hash version; };
-
default = {
+
darwin = {
rev = "v${finalAttrs.version}";
hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE=";
version = "1.10.3";
+
};
+
default = {
+
rev = "v${finalAttrs.version}";
+
hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw=";
+
version = "2.0";
};
};
in
···
installPhase = ''
mkdir -p $out/bin $bin $lib
+
# Replace both basedir forms to support both DXVK 2.0 and older versions.
substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \
-
--replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin"
+
--replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" \
+
--replace 'basedir="$(dirname "$(readlink -f "$0")")"' "basedir=$bin"
chmod a+x $out/bin/setup_dxvk.sh
declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
for arch in "''${!dxvks[@]}"; do
+14 -1
pkgs/misc/dxvk/dxvk.nix
···
, windows
, src
, version
+
, spirv-headers
+
, vulkan-headers
, dxvkPatches
}:
+
let
+
# DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin,
+
# which does not currently support DXVK 2.0, so adapt conditionally for this situation.
+
isDxvk2 = lib.versionAtLeast version "2.0";
+
in
stdenv.mkDerivation {
pname = "dxvk";
inherit src version;
nativeBuildInputs = [ glslang meson ninja ];
-
buildInputs = [ windows.pthreads ];
+
buildInputs = [ windows.pthreads ]
+
++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ];
patches = dxvkPatches;
+
+
preConfigure = lib.optionalString isDxvk2 ''
+
ln -s ${lib.getDev spirv-headers}/include include/spirv/include
+
ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include
+
'';
mesonFlags =
let
+1 -1
pkgs/misc/screensavers/alock/default.nix
···
description = "Simple screen lock application for X server";
longDescription = ''
alock locks the X server until the user enters a password
-
via the keyboard. If the authentification was successful
+
via the keyboard. If the authentication was successful
the X server is unlocked and the user can continue to work.
alock does not provide any fancy animations like xlock or
+1 -1
pkgs/misc/tmux-plugins/default.nix
···
};
meta = {
homepage = "https://github.com/tmux-plugins/tmux-continuum";
-
description = "continous saving of tmux environment";
+
description = "continuous saving of tmux environment";
longDescription =
''
Features:
+1 -1
pkgs/os-specific/darwin/yabai/default.nix
···
'';
# 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.
-
# 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.
+
# 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.
loadScriptingAddition = writeShellScript "yabai-load-sa" ''
# For whatever reason the regular commands to load the scripting addition do not work, yabai will throw an error.
# The installation command mutably installs binaries to '/System', but then fails to start them. Manually running
+2 -2
pkgs/os-specific/linux/brillo/default.nix
···
stdenv.mkDerivation rec {
pname = "brillo";
-
version = "1.4.10";
+
version = "1.4.11";
src = fetchFromGitLab {
owner= "cameronnemo";
repo= "brillo";
rev= "v${version}";
-
sha256 = "sha256-x8K6CMkOyR+kWRlqa/BmJogZo41LvsL1kfz6CZ5PaUI=";
+
sha256 = "sha256-R83Zx0dw9bmCF5kHTNYoNzCmJZK3cVzXNb30qAUexFc=";
};
patches = [
+2 -2
pkgs/os-specific/linux/systemd/default.nix
···
];
preConfigure =
let
-
# A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files.
+
# A list of all the runtime binaries that the systemd executables, tests and libraries are referencing in their source code, scripts and unit files.
# 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.
binaryReplacements = [
{ search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; }
···
"src/import/import-tar.c"
];
ignore = [
-
# occurences here refer to the tar sub command
+
# occurrences here refer to the tar sub command
"src/sysupdate/sysupdate-resource.c"
"src/sysupdate/sysupdate-transfer.c"
"src/import/pull.c"
+2 -2
pkgs/servers/dns/pdns/default.nix
···
stdenv.mkDerivation rec {
pname = "pdns";
-
version = "4.7.2";
+
version = "4.7.3";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-
hash = "sha256-TcrjXr3ASRWHLXv24tC8pLBcY1ChAKXPnCnfU7qlPOI=";
+
hash = "sha256-i601Gy4JQm9tT7A0aIGlFV/lVUl8PYUHHlMefHr+PnY=";
};
# redact configure flags from version output to reduce closure size
patches = [ ./version.patch ];
+3 -3
pkgs/servers/geospatial/martin/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "martin";
-
version = "0.6.1";
+
version = "0.6.2";
src = fetchFromGitHub {
owner = "maplibre";
repo = "martin";
rev = "v${version}";
-
hash = "sha256-k5PekD+7cmsRa7qRAqQ1gKaX7i07whKTgeU6OM39BBE=";
+
hash = "sha256-+XD4w6W6dyKuTItLQS0P/waksIVsPXVswcrCQ7jpw90=";
};
-
cargoHash = "sha256-rcyR1/b9Ap6mQR9yFDdsDJSvGxVNQrpt+t3sRSV4oPU=";
+
cargoHash = "sha256-U3oNyMS4S44ybAtt1/b0AXDLiag41XWt9DT5mKLQzm8=";
buildInputs = lib.optional stdenv.isDarwin Security;
+1 -1
pkgs/servers/http/nginx/generic.nix
···
passthru = {
modules = modules;
tests = {
-
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso;
+
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso;
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
acme-integration = nixosTests.acme;
} // passthru.tests;
+3 -5
pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix
···
buildGoModule rec {
pname = "modemmanager-exporter";
-
version = "0.1.0";
+
version = "0.2.0";
src = fetchFromGitHub {
owner = "mdlayher";
repo = "modemmanager_exporter";
rev = "v${version}";
-
sha256 = "0d8z7qzk5j5jj0ixkwpi8dw9kki78mxrajdlzzcj2rcgbnwair91";
+
sha256 = "sha256-wQATmTjYsm1J2DicPryoa/jVpbLjXz+1TTQUH5yGV6w=";
};
-
vendorSha256 = "0f6v97cvzdz7wygswpm87wf8r169x5rw28908vqhmqk644hli4zy";
-
-
doCheck = false;
+
vendorSha256 = "sha256-wGCRpFnt9bxc5Ygg6H1kI9sXB4mVFBdLeaahAFtvNbg=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) modemmanager; };
+1 -1
pkgs/servers/nextcloud/default.nix
···
in your NixOS config.
WARNING: if you were on Nextcloud 22 on NixOS 22.05 you have to upgrade to Nextcloud 23
-
first on 22.05 because Nextcloud doesn't support upgrades accross multiple major versions!
+
first on 22.05 because Nextcloud doesn't support upgrades across multiple major versions!
'';
nextcloud24 = generic {
+1 -1
pkgs/servers/nfd/default.nix
···
meta = with lib; {
homepage = "https://named-data.net/";
-
description = "Named Data Neworking (NDN) Forwarding Daemon";
+
description = "Named Data Networking (NDN) Forwarding Daemon";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = [ lib.maintainers.bertof ];
+1 -1
pkgs/servers/sql/postgresql/default.nix
···
# Note: the duplication of executables is about 4MB size.
# So a nicer solution was patching postgresql to allow setting the
-
# libdir explicitely.
+
# libdir explicitly.
postBuild = ''
mkdir -p $out/bin
rm $out/bin/{pg_config,postgres,pg_ctl}
+1 -1
pkgs/servers/web-apps/netbox/default.nix
···
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch
./graphql-3_2_0.patch
-
# fix compatiblity ith django 4.1
+
# fix compatibility ith django 4.1
(fetchpatch {
url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch";
sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc=";
+1 -1
pkgs/stdenv/generic/check-meta.nix
···
allowUnfreePredicate = config.allowUnfreePredicate or (x: false);
# Check whether unfree packages are allowed and if not, whether the
-
# package has an unfree license and is not explicitely allowed by the
+
# package has an unfree license and is not explicitly allowed by the
# `allowUnfreePredicate` function.
hasDeniedUnfreeLicense = attrs:
hasUnfreeLicense attrs &&
+1 -1
pkgs/tools/admin/azure-cli/default.nix
···
sha256 = "sha256-Y1P+cTOK7NbV7k9rg38vE7EPuZQo88IQW3IYYou8ZOI=";
};
-
# put packages that needs to be overriden in the py package scope
+
# put packages that needs to be overridden in the py package scope
py = import ./python-packages.nix {
inherit stdenv lib src version python3;
};
+3 -3
pkgs/tools/admin/infra/default.nix
···
buildGoModule rec {
pname = "infra";
-
version = "0.17.1";
+
version = "0.20.0";
src = fetchFromGitHub {
owner = "infrahq";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-iBTssDECRVh/3Iunfvykeoio6i8lN/Qty/ka0Kwe294=";
+
sha256 = "sha256-4sExRKq4J94cQYqjxaXCKa2aEeptCG+TTvrDOrJfBUg=";
};
-
vendorSha256 = "sha256-3J15UAu2s65f6UDDhCPIwL9fFBSICkZT2ruS88dAVYA=";
+
vendorSha256 = "sha256-afbQQsluZjgliNxSOGcTS1DJwj7en5NpxtuzCDAyv98=";
subPackages = [ "." ];
+1 -1
pkgs/tools/admin/pgadmin/default.nix
···
# checks will be run through nixos/tests
doCheck = false;
-
# speaklater3 is seperate because when passing buildDeps
+
# speaklater3 is separate because when passing buildDeps
# to the test, it fails there due to a collision with speaklater
propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];
+1 -1
pkgs/tools/misc/fpart/default.nix
···
Fpart also includes a live mode, which allows it to crawl very large
filesystems and produce partitions in live. Hooks are available to act on
-
those partitions (e.g. immediatly start a transfer using rsync(1))
+
those partitions (e.g. immediately start a transfer using rsync(1))
without having to wait for the filesystem traversal job to be finished.
Used this way, fpart can be seen as a powerful data migration tool.
'';
+1 -1
pkgs/tools/misc/librespeed-cli/default.nix
···
vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ=";
-
# Tests have additonal requirements
+
# Tests have additional requirements
doCheck = false;
meta = with lib; {
+1 -1
pkgs/tools/misc/sqlite3-to-mysql/default.nix
···
# tests require a mysql server instance
doCheck = false;
-
# run package tests as a seperate nixos test
+
# run package tests as a separate nixos test
passthru.tests = {
nixosTest = nixosTests.sqlite3-to-mysql;
};
+1 -1
pkgs/tools/networking/ipfetch/default.nix
···
'';
meta = with lib; {
-
description = "Neofetch but for ip adresses";
+
description = "Neofetch but for ip addresses";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ annaaurora ];
+1 -1
pkgs/tools/networking/ndn-tools/default.nix
···
meta = with lib; {
homepage = "https://named-data.net/";
-
description = "Named Data Neworking (NDN) Essential Tools";
+
description = "Named Data Networking (NDN) Essential Tools";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ bertof ];
+2 -2
pkgs/tools/security/faraday-cli/default.nix
···
python3.pkgs.buildPythonApplication rec {
pname = "faraday-cli";
-
version = "2.1.8";
+
version = "2.1.9";
format = "setuptools";
src = fetchFromGitHub {
owner = "infobyte";
repo = pname;
rev = "refs/tags/${version}";
-
hash = "sha256-b2vFejsksLcEchUqo+kw01S+dT2UMD5MPAzSWmpREgQ=";
+
hash = "sha256-8D1oYYqf0R41DPYtorcvykZ99p6P6Diwe7PgEN378pU=";
};
propagatedBuildInputs = with python3.pkgs; [
+1 -1
pkgs/tools/typesetting/docbook2odf/default.nix
···
meta = with lib; {
description = "Convert DocBook to OpenDocument Format (ODF)";
longDescription = ''
-
Docbook2odf is a toolkit that automaticaly converts DocBook to OASIS
+
Docbook2odf is a toolkit that automatically converts DocBook to OASIS
OpenDocument (ODF, the ISO standardized format used for texts,
spreadsheets and presentations). Conversion is based on a XSLT which
makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these
+3 -3
pkgs/tools/typesetting/tectonic/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "tectonic";
-
version = "0.11.0";
+
version = "0.12.0";
src = fetchFromGitHub {
owner = "tectonic-typesetting";
repo = "tectonic";
rev = "tectonic@${version}";
fetchSubmodules = true;
-
sha256 = "tBX737Yv4TvDo64cDYuALX61vzKjhz6PTMXQhWc5S/I=";
+
sha256 = "sha256-m2wBZNaepad4eaT/1DTjzAYrDX2wH/7wMfdzPWHQOLI=";
};
-
cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc=";
+
cargoSha256 = "sha256-pMqwWWmPxJZbJavxSVfjjRd7u9fI2AUZRjHF5SxxqoU=";
nativeBuildInputs = [ pkg-config makeBinaryWrapper ];
+1 -1
pkgs/tools/wayland/wev/default.nix
···
homepage = "https://git.sr.ht/~sircmpwn/wev";
description = "Wayland event viewer";
longDescription = ''
-
This is a tool for debugging events on a Wayland window, analagous to the
+
This is a tool for debugging events on a Wayland window, analogous to the
X11 tool xev.
'';
license = licenses.mit;
+2 -2
pkgs/top-level/all-packages.nix
···
extrude = callPackage ../tools/security/extrude { };
fastly = callPackage ../misc/fastly {
-
# If buildGoModule is overriden, provide a matching version of the go attribute
+
# If buildGoModule is overridden, provide a matching version of the go attribute
};
f2 = callPackage ../tools/misc/f2 {};
···
fstar = callPackage ../development/compilers/fstar {
# Work around while compatibility with ppxlib >= 0.26 is unavailable
-
# Should be removed when a fix is availaible
+
# Should be removed when a fix is available
# See https://github.com/FStarLang/FStar/issues/2681
ocamlPackages =
ocamlPackages.overrideScope' (self: super: {
+1 -1
pkgs/top-level/emacs-packages.nix
···
// manualPackages // { inherit manualPackages; }
// {
-
# Propagate overriden scope
+
# Propagate overridden scope
emacs = emacs'.overrideAttrs(old: {
passthru = (old.passthru or {}) // {
pkgs = dontRecurseIntoAttrs self;
+1 -1
pkgs/top-level/gnuradio-packages.nix
···
callPackage = self.newScope ({
inherit (gnuradio)
-
# Packages that are potentially overriden and used as deps here.
+
# Packages that are potentially overridden and used as deps here.
boost
volk
;
+1 -1
pkgs/top-level/php-packages.nix
···
# source, based on the php version.
#
# Name passed is the name of the extension and is automatically used
-
# to add the configureFlag "--enable-${name}", which can be overriden.
+
# to add the configureFlag "--enable-${name}", which can be overridden.
#
# Build inputs is used for extra deps that may be needed. And zendExtension
# will mark the extension as a zend extension or not.