Merge pull request #232923 from figsoda/typos

treewide: fix some typos

authored by

Nick Cao and committed by
GitHub
486995cc c7065be7

+133 -133
+1 -1
lib/generators.nix
··· 431 432 /* 433 Translate a simple Nix expression to Lua representation with occasional 434 - Lua-inlines that can be construted by mkLuaInline function. 435 436 Configuration: 437 * multiline - by default is true which results in indented block-like view.
··· 431 432 /* 433 Translate a simple Nix expression to Lua representation with occasional 434 + Lua-inlines that can be constructed by mkLuaInline function. 435 436 Configuration: 437 * multiline - by default is true which results in indented block-like view.
+2 -2
nixos/doc/manual/manpages/README.md
··· 17 - Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`. 18 - Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments. 19 - Required flags or arguments should not be marked. 20 - - Mutually exclusive groups of arguments should be enclosed in curly brackets, preferrably created with `Bro`/`Brc` blocks. 21 22 When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly: 23 ``` ··· 45 ... 46 .Ed 47 ``` 48 - Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be subsituted into them: 49 ``` 50 .Bd -literal -offset indent 51 {
··· 17 - Use `Cm` to mark literal string arguments, e.g. the `boot` command argument passed to `nixos-rebuild`. 18 - Optional flags or arguments should be marked with `Op`. This includes optional repeating arguments. 19 - Required flags or arguments should not be marked. 20 + - Mutually exclusive groups of arguments should be enclosed in curly brackets, preferably created with `Bro`/`Brc` blocks. 21 22 When an argument is used in an example it should be marked up with `Ar` again to differentiate it from a constant. For example, a command with a `--host name` flag that calls ssh to retrieve the host's local time would signify this thusly: 23 ``` ··· 45 ... 46 .Ed 47 ``` 48 + Contents of code blocks may be marked up further, e.g. if they refer to arguments that will be substituted into them: 49 ``` 50 .Bd -literal -offset indent 51 {
+2 -2
nixos/doc/manual/release-notes/rl-1609.section.md
··· 20 21 - A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages [were changed](https://github.com/NixOS/nixpkgs/pull/14766) late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) 22 23 - - Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided `haskell.packages.lts-x_y` package sets still exist in name to aviod breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. [The motivation for this change](https://nixos.org/nix-dev/2016-June/020585.html) has been discussed at length on the `nix-dev` mailing list and in [Github issue \#14897](https://github.com/NixOS/nixpkgs/issues/14897). Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in [another nix-dev article](https://nixos.org/nix-dev/2016-June/020642.html). 24 25 - Shell aliases for systemd sub-commands [were dropped](https://github.com/NixOS/nixpkgs/pull/15598): `start`, `stop`, `restart`, `status`. 26 ··· 28 29 - `/var/empty` is now immutable. Activation script runs `chattr +i` to forbid any modifications inside the folder. See [ the pull request](https://github.com/NixOS/nixpkgs/pull/18365) for what bugs this caused. 30 31 - - Gitlab's maintainance script `gitlab-runner` was removed and split up into the more clearer `gitlab-run` and `gitlab-rake` scripts, because `gitlab-runner` is a component of Gitlab CI. 32 33 - `services.xserver.libinput.accelProfile` default changed from `flat` to `adaptive`, as per [ official documentation](https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79). 34
··· 20 21 - A large number of packages have been converted to use the multiple outputs feature of Nix to greatly reduce the amount of required disk space, as mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages [were changed](https://github.com/NixOS/nixpkgs/pull/14766) late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.) 22 23 + - Previous versions of Nixpkgs had support for all versions of the LTS Haskell package set. That support has been dropped. The previously provided `haskell.packages.lts-x_y` package sets still exist in name to avoid breaking user code, but these package sets don't actually contain the versions mandated by the corresponding LTS release. Instead, our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. [The motivation for this change](https://nixos.org/nix-dev/2016-June/020585.html) has been discussed at length on the `nix-dev` mailing list and in [Github issue \#14897](https://github.com/NixOS/nixpkgs/issues/14897). Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in [another nix-dev article](https://nixos.org/nix-dev/2016-June/020642.html). 24 25 - Shell aliases for systemd sub-commands [were dropped](https://github.com/NixOS/nixpkgs/pull/15598): `start`, `stop`, `restart`, `status`. 26 ··· 28 29 - `/var/empty` is now immutable. Activation script runs `chattr +i` to forbid any modifications inside the folder. See [ the pull request](https://github.com/NixOS/nixpkgs/pull/18365) for what bugs this caused. 30 31 + - Gitlab's maintenance script `gitlab-runner` was removed and split up into the more clearer `gitlab-run` and `gitlab-rake` scripts, because `gitlab-runner` is a component of Gitlab CI. 32 33 - `services.xserver.libinput.accelProfile` default changed from `flat` to `adaptive`, as per [ official documentation](https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79). 34
+1 -1
nixos/doc/manual/release-notes/rl-1709.section.md
··· 275 276 You can check that backups still work by running `systemctl start mysql-backup` then `systemctl status mysql-backup`. 277 278 - - Templated systemd services e.g `container@name` are now handled currectly when switching to a new configuration, resulting in them being reloaded. 279 280 - Steam: the `newStdcpp` parameter was removed and should not be needed anymore. 281
··· 275 276 You can check that backups still work by running `systemctl start mysql-backup` then `systemctl status mysql-backup`. 277 278 + - Templated systemd services e.g `container@name` are now handled correctly when switching to a new configuration, resulting in them being reloaded. 279 280 - Steam: the `newStdcpp` parameter was removed and should not be needed anymore. 281
+1 -1
nixos/doc/manual/release-notes/rl-1803.section.md
··· 174 175 - The `openssh` package now includes Kerberos support by default; the `openssh_with_kerberos` package is now a deprecated alias. If you do not want Kerberos support, you can do `openssh.override { withKerberos = false; }`. Note, this also applies to the `openssh_hpn` package. 176 177 - - `cc-wrapper` has been split in two; there is now also a `bintools-wrapper`. The most commonly used files in `nix-support` are now split between the two wrappers. Some commonly used ones, like `nix-support/dynamic-linker`, are duplicated for backwards compatability, even though they rightly belong only in `bintools-wrapper`. Other more obscure ones are just moved. 178 179 - The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many `propagatedNativeBuildInputs` should instead be `propagatedBuildInputs`. Thankfully, that was and is the least used type of dependency. Also, it means that some `propagatedBuildInputs` should instead be `depsTargetTargetPropagated`. Other types dependencies should be unaffected. 180
··· 174 175 - The `openssh` package now includes Kerberos support by default; the `openssh_with_kerberos` package is now a deprecated alias. If you do not want Kerberos support, you can do `openssh.override { withKerberos = false; }`. Note, this also applies to the `openssh_hpn` package. 176 177 + - `cc-wrapper` has been split in two; there is now also a `bintools-wrapper`. The most commonly used files in `nix-support` are now split between the two wrappers. Some commonly used ones, like `nix-support/dynamic-linker`, are duplicated for backwards compatibility, even though they rightly belong only in `bintools-wrapper`. Other more obscure ones are just moved. 178 179 - The propagation logic has been changed. The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual. The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what. In practice, that means that many `propagatedNativeBuildInputs` should instead be `propagatedBuildInputs`. Thankfully, that was and is the least used type of dependency. Also, it means that some `propagatedBuildInputs` should instead be `depsTargetTargetPropagated`. Other types dependencies should be unaffected. 180
+3 -3
nixos/doc/manual/release-notes/rl-1903.section.md
··· 81 82 The slurmctld now runs as user `slurm` instead of `root`. If you want to keep slurmctld running as `root`, set `services.slurm.user = root`. 83 84 - The options `services.slurm.nodeName` and `services.slurm.partitionName` are now sets of strings to correctly reflect that fact that each of these options can occour more than once in the configuration. 85 86 - The `solr` package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The `services.solr` module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. 87 ··· 91 92 - Network interface indiscriminate NixOS firewall options (`networking.firewall.allow*`) are now preserved when also setting interface specific rules such as `networking.firewall.interfaces.en0.allow*`. These rules continue to use the pseudo device "default" (`networking.firewall.interfaces.default.*`), and assigning to this pseudo device will override the (`networking.firewall.allow*`) options. 93 94 - - The `nscd` service now disables all caching of `passwd` and `group` databases by default. This was interferring with the correct functioning of the `libnss_systemd.so` module which is used by `systemd` to manage uids and usernames in the presence of `DynamicUser=` in systemd services. This was already the default behaviour in presence of `services.sssd.enable = true` because nscd caching would interfere with `sssd` in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. 95 96 If the old behaviour is desired, this can be restored by setting the `services.nscd.config` option with the desired caching parameters. 97 ··· 135 136 - GitLab Shell previously used the nix store paths for the `gitlab-shell` command in its `authorized_keys` file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As `gitlab-shell` has now been changed to use `/var/run/current-system/sw/bin/gitlab-shell`, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the `authorized_keys` file via `sudo -u git -H gitlab-rake gitlab:shell:setup` in that case. 137 138 - - The `pam_unix` account module is now loaded with its control field set to `required` instead of `sufficient`, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to `pam_unix`. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previosuly shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting `security.pam.services.<name?>.text`. 139 140 - The `pam_unix` password module is now loaded with its control field set to `sufficient` instead of `required`, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by `pam_unix`, preventing `pam_ldap` to manage the password as it should. 141
··· 81 82 The slurmctld now runs as user `slurm` instead of `root`. If you want to keep slurmctld running as `root`, set `services.slurm.user = root`. 83 84 + The options `services.slurm.nodeName` and `services.slurm.partitionName` are now sets of strings to correctly reflect that fact that each of these options can occur more than once in the configuration. 85 86 - The `solr` package has been upgraded from 4.10.3 to 7.5.0 and has undergone some major changes. The `services.solr` module has been updated to reflect these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading. 87 ··· 91 92 - Network interface indiscriminate NixOS firewall options (`networking.firewall.allow*`) are now preserved when also setting interface specific rules such as `networking.firewall.interfaces.en0.allow*`. These rules continue to use the pseudo device "default" (`networking.firewall.interfaces.default.*`), and assigning to this pseudo device will override the (`networking.firewall.allow*`) options. 93 94 + - The `nscd` service now disables all caching of `passwd` and `group` databases by default. This was interfering with the correct functioning of the `libnss_systemd.so` module which is used by `systemd` to manage uids and usernames in the presence of `DynamicUser=` in systemd services. This was already the default behaviour in presence of `services.sssd.enable = true` because nscd caching would interfere with `sssd` in unpredictable ways as well. Because we're using nscd not for caching, but for convincing glibc to find NSS modules in the nix store instead of an absolute path, we have decided to disable caching globally now, as it's usually not the behaviour the user wants and can lead to surprising behaviour. Furthermore, negative caching of host lookups is also disabled now by default. This should fix the issue of dns lookups failing in the presence of an unreliable network. 95 96 If the old behaviour is desired, this can be restored by setting the `services.nscd.config` option with the desired caching parameters. 97 ··· 135 136 - GitLab Shell previously used the nix store paths for the `gitlab-shell` command in its `authorized_keys` file, which might stop working after garbage collection. To circumvent that, we regenerated that file on each startup. As `gitlab-shell` has now been changed to use `/var/run/current-system/sw/bin/gitlab-shell`, this is not necessary anymore, but there might be leftover lines with a nix store path. Regenerate the `authorized_keys` file via `sudo -u git -H gitlab-rake gitlab:shell:setup` in that case. 137 138 + - The `pam_unix` account module is now loaded with its control field set to `required` instead of `sufficient`, so that later PAM account modules that might do more extensive checks are being executed. Previously, the whole account module verification was exited prematurely in case a nss module provided the account name to `pam_unix`. The LDAP and SSSD NixOS modules already add their NSS modules when enabled. In case your setup breaks due to some later PAM account module previously shadowed, or failing NSS lookups, please file a bug. You can get back the old behaviour by manually setting `security.pam.services.<name?>.text`. 139 140 - The `pam_unix` password module is now loaded with its control field set to `sufficient` instead of `required`, so that password managed only by later PAM password modules are being executed. Previously, for example, changing an LDAP account's password through PAM was not possible: the whole password module verification was exited prematurely by `pam_unix`, preventing `pam_ldap` to manage the password as it should. 141
+1 -1
nixos/doc/manual/release-notes/rl-1909.section.md
··· 194 195 `security.acme.preDelay` and `security.acme.activationDelay` options have been removed. To execute a service before certificates are provisioned or renewed add a `RequiredBy=acme-${cert}.service` to any service. 196 197 - Furthermore, the acme module will not automatically add a dependency on `lighttpd.service` anymore. If you are using certficates provided by letsencrypt for lighttpd, then you should depend on the certificate service `acme-${cert}.service>` manually. 198 199 For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts.<name>.enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). 200
··· 194 195 `security.acme.preDelay` and `security.acme.activationDelay` options have been removed. To execute a service before certificates are provisioned or renewed add a `RequiredBy=acme-${cert}.service` to any service. 196 197 + Furthermore, the acme module will not automatically add a dependency on `lighttpd.service` anymore. If you are using certificates provided by letsencrypt for lighttpd, then you should depend on the certificate service `acme-${cert}.service>` manually. 198 199 For nginx, the dependencies are still automatically managed when `services.nginx.virtualhosts.<name>.enableACME` is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs, instead of depending on the catch-all `acme-certificates.target`. This target unit was also removed from the codebase. This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at [NixOS/nixpkgs\#60180](https://github.com/NixOS/nixpkgs/issues/60180). 200
+2 -2
nixos/doc/manual/release-notes/rl-2009.section.md
··· 130 131 - [services.cage.enable](options.html#opt-services.cage.enable) Wayland cage service 132 133 - - [services.convos.enable](options.html#opt-services.convos.enable) IRC daemon, which can be accessed throught the browser 134 135 - [services.engelsystem.enable](options.html#opt-services.engelsystem.enable) Tool for coordinating volunteers and shifts on large events 136 ··· 552 553 - The [jellyfin](options.html#opt-services.jellyfin.enable) module will use and stay on the Jellyfin version `10.5.5` if `stateVersion` is lower than `20.09`. This is because significant changes were made to the database schema, and it is highly recommended to backup your instance before upgrading. After making your backup, you can upgrade to the latest version either by setting your `stateVersion` to `20.09` or higher, or set the `services.jellyfin.package` to `pkgs.jellyfin`. If you do not wish to upgrade Jellyfin, but want to change your `stateVersion`, you can set the value of `services.jellyfin.package` to `pkgs.jellyfin_10_5`. 554 555 - - The `security.rngd` service is now disabled by default. This choice was made because there's krngd in the linux kernel space making it (for most usecases) functionally redundent. 556 557 - The `hardware.nvidia.optimus_prime.enable` service has been renamed to `hardware.nvidia.prime.sync.enable` and has many new enhancements. Related nvidia prime settings may have also changed. 558
··· 130 131 - [services.cage.enable](options.html#opt-services.cage.enable) Wayland cage service 132 133 + - [services.convos.enable](options.html#opt-services.convos.enable) IRC daemon, which can be accessed through the browser 134 135 - [services.engelsystem.enable](options.html#opt-services.engelsystem.enable) Tool for coordinating volunteers and shifts on large events 136 ··· 552 553 - The [jellyfin](options.html#opt-services.jellyfin.enable) module will use and stay on the Jellyfin version `10.5.5` if `stateVersion` is lower than `20.09`. This is because significant changes were made to the database schema, and it is highly recommended to backup your instance before upgrading. After making your backup, you can upgrade to the latest version either by setting your `stateVersion` to `20.09` or higher, or set the `services.jellyfin.package` to `pkgs.jellyfin`. If you do not wish to upgrade Jellyfin, but want to change your `stateVersion`, you can set the value of `services.jellyfin.package` to `pkgs.jellyfin_10_5`. 554 555 + - The `security.rngd` service is now disabled by default. This choice was made because there's krngd in the linux kernel space making it (for most usecases) functionally redundant. 556 557 - The `hardware.nvidia.optimus_prime.enable` service has been renamed to `hardware.nvidia.prime.sync.enable` and has many new enhancements. Related nvidia prime settings may have also changed. 558
+3 -3
nixos/doc/manual/release-notes/rl-2105.section.md
··· 197 198 Android packages are now loaded from a repo.json file created by parsing Android repo XML files. The arguments `repoJson` and `repoXmls` have been added to allow overriding the built-in androidenv repo.json with your own. Additionally, license files are now written to allow compatibility with Gradle-based tools, and the `extraLicenses` argument has been added to accept more SDK licenses if your project requires it. See the androidenv documentation for more details. 199 200 - - The attribute `mpi` is now consistently used to provide a default, system-wide MPI implementation. The default implementation is openmpi, which has been used before by all derivations affects by this change. Note that all packages that have used `mpi ? null` in the input for optional MPI builds, have been changed to the boolean input paramater `useMpi` to enable building with MPI. Building all packages with `mpich` instead of the default `openmpi` can now be achived like this: 201 202 ```nix 203 self: super: ··· 272 273 - `environment.defaultPackages` now includes the nano package. If pkgs.nano is not added to the list, make sure another editor is installed and the `EDITOR` environment variable is set to it. Environment variables can be set using `environment.variables`. 274 275 - - `services.minio.dataDir` changed type to a list of paths, required for specifiyng multiple data directories for using with erasure coding. Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements. 276 277 - All CUDA toolkit versions prior to CUDA 10 have been removed. 278 ··· 375 376 - When defining a new user, one of [users.users._name_.isNormalUser](options.html#opt-users.users._name_.isNormalUser) and [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) is now required. This is to prevent accidentally giving a UID above 1000 to system users, which could have unexpected consequences, like running user activation scripts for system users. Note that users defined with an explicit UID below 500 are exempted from this check, as [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) has no effect for those. 377 378 - - The `security.apparmor` module, for the [AppArmor](https://gitlab.com/apparmor/apparmor/-/wikis/Documentation) Mandatory Access Control system, has been substantialy improved along with related tools, so that module maintainers can now more easily write AppArmor profiles for NixOS. The most notable change on the user-side is the new option [security.apparmor.policies](options.html#opt-security.apparmor.policies), replacing the previous `profiles` option to provide a way to disable a profile and to select whether to confine in enforce mode (default) or in complain mode (see `journalctl -b --grep apparmor`). Security-minded users may also want to enable [security.apparmor.killUnconfinedConfinables](options.html#opt-security.apparmor.killUnconfinedConfinables), at the cost of having some of their processes killed when updating to a NixOS version introducing new AppArmor profiles. 379 380 - The GNOME desktop manager once again installs gnome.epiphany by default. 381
··· 197 198 Android packages are now loaded from a repo.json file created by parsing Android repo XML files. The arguments `repoJson` and `repoXmls` have been added to allow overriding the built-in androidenv repo.json with your own. Additionally, license files are now written to allow compatibility with Gradle-based tools, and the `extraLicenses` argument has been added to accept more SDK licenses if your project requires it. See the androidenv documentation for more details. 199 200 + - The attribute `mpi` is now consistently used to provide a default, system-wide MPI implementation. The default implementation is openmpi, which has been used before by all derivations affects by this change. Note that all packages that have used `mpi ? null` in the input for optional MPI builds, have been changed to the boolean input parameter `useMpi` to enable building with MPI. Building all packages with `mpich` instead of the default `openmpi` can now be achieved like this: 201 202 ```nix 203 self: super: ··· 272 273 - `environment.defaultPackages` now includes the nano package. If pkgs.nano is not added to the list, make sure another editor is installed and the `EDITOR` environment variable is set to it. Environment variables can be set using `environment.variables`. 274 275 + - `services.minio.dataDir` changed type to a list of paths, required for specifying multiple data directories for using with erasure coding. Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements. 276 277 - All CUDA toolkit versions prior to CUDA 10 have been removed. 278 ··· 375 376 - When defining a new user, one of [users.users._name_.isNormalUser](options.html#opt-users.users._name_.isNormalUser) and [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) is now required. This is to prevent accidentally giving a UID above 1000 to system users, which could have unexpected consequences, like running user activation scripts for system users. Note that users defined with an explicit UID below 500 are exempted from this check, as [users.users._name_.isSystemUser](options.html#opt-users.users._name_.isSystemUser) has no effect for those. 377 378 + - The `security.apparmor` module, for the [AppArmor](https://gitlab.com/apparmor/apparmor/-/wikis/Documentation) Mandatory Access Control system, has been substantially improved along with related tools, so that module maintainers can now more easily write AppArmor profiles for NixOS. The most notable change on the user-side is the new option [security.apparmor.policies](options.html#opt-security.apparmor.policies), replacing the previous `profiles` option to provide a way to disable a profile and to select whether to confine in enforce mode (default) or in complain mode (see `journalctl -b --grep apparmor`). Security-minded users may also want to enable [security.apparmor.killUnconfinedConfinables](options.html#opt-security.apparmor.killUnconfinedConfinables), at the cost of having some of their processes killed when updating to a NixOS version introducing new AppArmor profiles. 379 380 - The GNOME desktop manager once again installs gnome.epiphany by default. 381
+1 -1
nixos/doc/manual/release-notes/rl-2111.section.md
··· 375 376 - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. 377 378 - - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. 379 380 - The fontconfig service's dpi option has been removed. 381 Fontconfig should use Xft settings by default so there's no need to override one value in multiple places.
··· 375 376 - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument. 377 378 + - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`hardware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group. 379 380 - The fontconfig service's dpi option has been removed. 381 Fontconfig should use Xft settings by default so there's no need to override one value in multiple places.
+6 -6
nixos/doc/manual/release-notes/rl-2205.section.md
··· 10 for Flakes, but also marks the `nix` command as experimental which now has to 11 be enabled via the configuration explicitly. For more information and 12 instructions for upgrades, see the 13 - relase notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html), 14 [nix-2.5](https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html), 15 [nix-2.6](https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html), 16 [nix-2.7](https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html) and ··· 278 279 - `openldap` (and therefore the slapd LDAP server) were updated to version 2.6.2. The project introduced backwards-incompatible changes, namely the removal of the bdb, hdb, ndb, and shell backends in slapd. Therefore before updating, dump your database `slapcat -n 1` in LDIF format, and reimport it after updating your `services.openldap.settings`, which represents your `cn=config`. 280 281 - Additionally with 2.5 the argon2 module was included in the standard distrubtion and renamed from `pw-argon2` to `argon2`. Remember to update your `olcModuleLoad` entry in `cn=config`. 282 283 - `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface. 284 285 - - `git` no longer hardcodes the path to openssh' ssh binary to reduce the amount of rebuilds. If you are using git with ssh remotes and do not have a ssh binary in your enviroment consider adding `openssh` to it or switching to `gitFull`. 286 287 - `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`. 288 This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration. ··· 639 changes in the database scheme and configuration format. 640 641 - Some top-level settings under [services.epgstation](#opt-services.epgstation.enable) 642 - is now deprecated because it was redudant due to the same options being 643 present in [services.epgstation.settings](#opt-services.epgstation.settings). 644 645 - The option `services.epgstation.basicAuth` was removed because basic ··· 653 option now expects options for `config.yml` in EPGStation v2. 654 655 - Existing data for the [services.epgstation](#opt-services.epgstation.enable) 656 - module would have to be backed up prior to the upgrade. To back up exising 657 data to `/tmp/epgstation.bak`, run 658 `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`. 659 To import that data after to the upgrade, run ··· 804 - The `influxdb2` package was split into `influxdb2-server` and 805 `influxdb2-cli`, matching the split that took place upstream. A 806 combined `influxdb2` package is still provided in this release for 807 - backwards compatibilty, but will be removed at a later date. 808 809 - The `unifi` package was switched from `unifi6` to `unifi7`. 810 Direct downgrades from Unifi 7 to Unifi 6 are not possible and require restoring from a backup made by Unifi 6.
··· 10 for Flakes, but also marks the `nix` command as experimental which now has to 11 be enabled via the configuration explicitly. For more information and 12 instructions for upgrades, see the 13 + release notes for [nix-2.4](https://nixos.org/manual/nix/stable/release-notes/rl-2.4.html), 14 [nix-2.5](https://nixos.org/manual/nix/stable/release-notes/rl-2.5.html), 15 [nix-2.6](https://nixos.org/manual/nix/stable/release-notes/rl-2.6.html), 16 [nix-2.7](https://nixos.org/manual/nix/stable/release-notes/rl-2.7.html) and ··· 278 279 - `openldap` (and therefore the slapd LDAP server) were updated to version 2.6.2. The project introduced backwards-incompatible changes, namely the removal of the bdb, hdb, ndb, and shell backends in slapd. Therefore before updating, dump your database `slapcat -n 1` in LDIF format, and reimport it after updating your `services.openldap.settings`, which represents your `cn=config`. 280 281 + Additionally with 2.5 the argon2 module was included in the standard distribution and renamed from `pw-argon2` to `argon2`. Remember to update your `olcModuleLoad` entry in `cn=config`. 282 283 - `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface. 284 285 + - `git` no longer hardcodes the path to openssh' ssh binary to reduce the amount of rebuilds. If you are using git with ssh remotes and do not have a ssh binary in your environment consider adding `openssh` to it or switching to `gitFull`. 286 287 - `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`. 288 This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration. ··· 639 changes in the database scheme and configuration format. 640 641 - Some top-level settings under [services.epgstation](#opt-services.epgstation.enable) 642 + is now deprecated because it was redundant due to the same options being 643 present in [services.epgstation.settings](#opt-services.epgstation.settings). 644 645 - The option `services.epgstation.basicAuth` was removed because basic ··· 653 option now expects options for `config.yml` in EPGStation v2. 654 655 - Existing data for the [services.epgstation](#opt-services.epgstation.enable) 656 + module would have to be backed up prior to the upgrade. To back up existing 657 data to `/tmp/epgstation.bak`, run 658 `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`. 659 To import that data after to the upgrade, run ··· 804 - The `influxdb2` package was split into `influxdb2-server` and 805 `influxdb2-cli`, matching the split that took place upstream. A 806 combined `influxdb2` package is still provided in this release for 807 + backwards compatibility, but will be removed at a later date. 808 809 - The `unifi` package was switched from `unifi6` to `unifi7`. 810 Direct downgrades from Unifi 7 to Unifi 6 are not possible and require restoring from a backup made by Unifi 6.
+2 -2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 205 206 - Linux 4.9 has been removed because it will reach its end of life within the lifespan of 22.11. 207 208 - - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. 209 Use `configure.packages` instead. 210 - Neovim can not be configured with plug anymore (still works for vim). 211 ··· 221 222 - `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information. 223 224 - - Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary. 225 - `k3s` supports `clusterInit` option, and it is enabled by default, for servers. 226 227 - `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible.
··· 205 206 - Linux 4.9 has been removed because it will reach its end of life within the lifespan of 22.11. 207 208 + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintenance burden. 209 Use `configure.packages` instead. 210 - Neovim can not be configured with plug anymore (still works for vim). 211 ··· 221 222 - `mysql57` has been removed. Please update to `mysql80` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information. 223 224 + - Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be necessary. 225 - `k3s` supports `clusterInit` option, and it is enabled by default, for servers. 226 227 - `percona-server56` has been removed. Please migrate to `mysql` or `mariadb` if possible.
+6 -6
nixos/doc/manual/release-notes/rl-2305.section.md
··· 72 73 - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). 74 75 - - [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Availabe as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie). 76 77 - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable). 78 ··· 88 89 - [alertmanager-irc-relay](https://github.com/google/alertmanager-irc-relay), a Prometheus Alertmanager IRC Relay. Available as [services.prometheus.alertmanagerIrcRelay](options.html#opt-services.prometheus.alertmanagerIrcRelay.enable). 90 91 - - [tts](https://github.com/coqui-ai/TTS), a battle-tested deep learning toolkit for Text-to-Speech. Mutiple servers may be configured below [services.tts.servers](#opt-services.tts.servers). 92 93 - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). 94 ··· 98 99 - [gonic](https://github.com/sentriz/gonic), a Subsonic music streaming server. Available as [services.gonic](#opt-services.gonic.enable). 100 101 - - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). 102 103 - [QDMR](https://dm3mat.darc.de/qdmr/), a GUI application and command line tool for programming DMR radios [programs.qdmr](#opt-programs.qdmr.enable) 104 ··· 287 288 - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. 289 290 - - Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others. 291 292 - The latest available version of Nextcloud is v26 (available as `pkgs.nextcloud26`) which uses PHP 8.2 as interpreter by default. The installation logic is as follows: 293 - If `system.stateVersion` is >=23.05, `pkgs.nextcloud26` will be installed by default. ··· 302 [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) 303 for more details and available replacements. 304 305 - - The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer a alias for backwards compatiblity. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed). 306 307 - [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. 308 ··· 567 568 The Pipewire config semantics don't really match the NixOS module semantics, so it's extremely awkward to override the default config, especially when lists are involved. Vendoring the configuration files in nixpkgs also creates unnecessary maintenance overhead. 569 570 - Also, upstream added a lot of accomodations to allow doing most of the things you'd want to do with a config edit in better ways. 571 572 #### Migrating your configuration {#sec-release-23.05-migration-pipewire-how} 573
··· 72 73 - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). 74 75 + - [Budgie Desktop](https://github.com/BuddiesOfBudgie/budgie-desktop), a familiar, modern desktop environment. Available as [services.xserver.desktopManager.budgie](options.html#opt-services.xserver.desktopManager.budgie). 76 77 - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable). 78 ··· 88 89 - [alertmanager-irc-relay](https://github.com/google/alertmanager-irc-relay), a Prometheus Alertmanager IRC Relay. Available as [services.prometheus.alertmanagerIrcRelay](options.html#opt-services.prometheus.alertmanagerIrcRelay.enable). 90 91 + - [tts](https://github.com/coqui-ai/TTS), a battle-tested deep learning toolkit for Text-to-Speech. Multiple servers may be configured below [services.tts.servers](#opt-services.tts.servers). 92 93 - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). 94 ··· 98 99 - [gonic](https://github.com/sentriz/gonic), a Subsonic music streaming server. Available as [services.gonic](#opt-services.gonic.enable). 100 101 + - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and receives MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). 102 103 - [QDMR](https://dm3mat.darc.de/qdmr/), a GUI application and command line tool for programming DMR radios [programs.qdmr](#opt-programs.qdmr.enable) 104 ··· 287 288 - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. 289 290 + - Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constituents: `xorg.libX11`, `freetype` and others. 291 292 - The latest available version of Nextcloud is v26 (available as `pkgs.nextcloud26`) which uses PHP 8.2 as interpreter by default. The installation logic is as follows: 293 - If `system.stateVersion` is >=23.05, `pkgs.nextcloud26` will be installed by default. ··· 302 [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) 303 for more details and available replacements. 304 305 + - The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer a alias for backwards compatibility. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed). 306 307 - [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. 308 ··· 567 568 The Pipewire config semantics don't really match the NixOS module semantics, so it's extremely awkward to override the default config, especially when lists are involved. Vendoring the configuration files in nixpkgs also creates unnecessary maintenance overhead. 569 570 + Also, upstream added a lot of accommodations to allow doing most of the things you'd want to do with a config edit in better ways. 571 572 #### Migrating your configuration {#sec-release-23.05-migration-pipewire-how} 573
+3 -3
nixos/lib/test-driver/test_driver/machine.py
··· 133 134 135 class StartCommand: 136 - """The Base Start Command knows how to append the necesary 137 runtime qemu options as determined by a particular test driver 138 run. Any such start command is expected to happily receive and 139 append additional qemu args. ··· 211 class NixStartScript(StartCommand): 212 """A start script from nixos/modules/virtualiation/qemu-vm.nix 213 that also satisfies the requirement of the BaseStartCommand. 214 - These Nix commands have the particular charactersitic that the 215 machine name can be extracted out of them via a regex match. 216 (Admittedly a _very_ implicit contract, evtl. TODO fix) 217 """ ··· 527 timeout_str = f"timeout {timeout}" 528 529 # While sh is bash on NixOS, this is not the case for every distro. 530 - # We explicitely call bash here to allow for the driver to boot other distros as well. 531 out_command = ( 532 f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n" 533 )
··· 133 134 135 class StartCommand: 136 + """The Base Start Command knows how to append the necessary 137 runtime qemu options as determined by a particular test driver 138 run. Any such start command is expected to happily receive and 139 append additional qemu args. ··· 211 class NixStartScript(StartCommand): 212 """A start script from nixos/modules/virtualiation/qemu-vm.nix 213 that also satisfies the requirement of the BaseStartCommand. 214 + These Nix commands have the particular characteristic that the 215 machine name can be extracted out of them via a regex match. 216 (Admittedly a _very_ implicit contract, evtl. TODO fix) 217 """ ··· 527 timeout_str = f"timeout {timeout}" 528 529 # While sh is bash on NixOS, this is not the case for every distro. 530 + # We explicitly call bash here to allow for the driver to boot other distros as well. 531 out_command = ( 532 f"{timeout_str} bash -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n" 533 )
+1 -1
nixos/maintainers/scripts/ec2/amazon-image.nix
··· 10 11 imports = [ ../../../modules/virtualisation/amazon-image.nix ]; 12 13 - # Amazon recomments setting this to the highest possible value for a good EBS 14 # experience, which prior to 4.15 was 255. 15 # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes 16 config.boot.kernelParams =
··· 10 11 imports = [ ../../../modules/virtualisation/amazon-image.nix ]; 12 13 + # Amazon recommends setting this to the highest possible value for a good EBS 14 # experience, which prior to 4.15 was 255. 15 # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes 16 config.boot.kernelParams =
+1 -1
nixos/modules/config/xdg/portal.nix
··· 21 in 22 { 23 warnings = lib.mkIf config.xdg.portal.gtkUsePortal [ 24 - "The option `${lib.showOption from}' defined in ${lib.showFiles fromOpt.files} has been deprecated. Setting the variable globally with `environment.sessionVariables' NixOS option can have unforseen side-effects." 25 ]; 26 } 27 )
··· 21 in 22 { 23 warnings = lib.mkIf config.xdg.portal.gtkUsePortal [ 24 + "The option `${lib.showOption from}' defined in ${lib.showFiles fromOpt.files} has been deprecated. Setting the variable globally with `environment.sessionVariables' NixOS option can have unforeseen side-effects." 25 ]; 26 } 27 )
+1 -1
nixos/modules/hardware/sensor/hddtemp.nix
··· 43 }; 44 45 unit = mkOption { 46 - description = lib.mdDoc "Celcius or Fahrenheit"; 47 type = types.enum [ "C" "F" ]; 48 default = "C"; 49 };
··· 43 }; 44 45 unit = mkOption { 46 + description = lib.mdDoc "Celsius or Fahrenheit"; 47 type = types.enum [ "C" "F" ]; 48 default = "C"; 49 };
+1 -1
nixos/modules/installer/tools/nixos-enter.sh
··· 97 exec 2>/dev/null 98 fi 99 100 - # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. 101 LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true 102 103 # Create /tmp. This is needed for nix-build and the NixOS activation script to work.
··· 97 exec 2>/dev/null 98 fi 99 100 + # Run the activation script. Set $LOCALE_ARCHIVE to suppress some Perl locale warnings. 101 LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true 102 103 # Create /tmp. This is needed for nix-build and the NixOS activation script to work.
+2 -2
nixos/modules/misc/version.nix
··· 9 literalExpression mkRenamedOptionModule mkDefault mkOption trivial types; 10 11 needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s; 12 - escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"''; 13 attrsToText = attrs: 14 concatStringsSep "\n" ( 15 - mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs 16 ) + "\n"; 17 18 osReleaseContents = {
··· 9 literalExpression mkRenamedOptionModule mkDefault mkOption trivial types; 10 11 needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s; 12 + escapeIfNecessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"''; 13 attrsToText = attrs: 14 concatStringsSep "\n" ( 15 + mapAttrsToList (n: v: ''${n}=${escapeIfNecessary (toString v)}'') attrs 16 ) + "\n"; 17 18 osReleaseContents = {
+1 -1
nixos/modules/programs/fish.nix
··· 303 programs.fish.interactiveShellInit = '' 304 # add completions generated by NixOS to $fish_complete_path 305 begin 306 - # joins with null byte to acommodate all characters in paths, then respectively gets all paths before (exclusive) / after (inclusive) the first one including "generated_completions", 307 # splits by null byte, and then removes all empty lines produced by using 'string' 308 set -l prev (string join0 $fish_complete_path | string match --regex "^.*?(?=\x00[^\x00]*generated_completions.*)" | string split0 | string match -er ".") 309 set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".")
··· 303 programs.fish.interactiveShellInit = '' 304 # add completions generated by NixOS to $fish_complete_path 305 begin 306 + # joins with null byte to accommodate all characters in paths, then respectively gets all paths before (exclusive) / after (inclusive) the first one including "generated_completions", 307 # splits by null byte, and then removes all empty lines produced by using 'string' 308 set -l prev (string join0 $fish_complete_path | string match --regex "^.*?(?=\x00[^\x00]*generated_completions.*)" | string split0 | string match -er ".") 309 set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".")
+1 -1
nixos/modules/programs/nix-ld.nix
··· 2 let 3 cfg = config.programs.nix-ld; 4 5 - # TODO make glibc here configureable? 6 nix-ld-so = pkgs.runCommand "ld.so" {} '' 7 ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out 8 '';
··· 2 let 3 cfg = config.programs.nix-ld; 4 5 + # TODO make glibc here configurable? 6 nix-ld-so = pkgs.runCommand "ld.so" {} '' 7 ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out 8 '';
+3 -3
nixos/modules/programs/singularity.nix
··· 25 type = types.nullOr types.package; 26 default = null; 27 description = mdDoc '' 28 - This option provides access to the overriden result of `programs.singularity.package`. 29 30 - For example, the following configuration makes all the Nixpkgs packages use the overriden `singularity`: 31 ```Nix 32 { config, lib, pkgs, ... }: 33 { ··· 42 } 43 ``` 44 45 - Use `lib.mkForce` to forcefully specify the overriden package. 46 ''; 47 }; 48 enableFakeroot = mkOption {
··· 25 type = types.nullOr types.package; 26 default = null; 27 description = mdDoc '' 28 + This option provides access to the overridden result of `programs.singularity.package`. 29 30 + For example, the following configuration makes all the Nixpkgs packages use the overridden `singularity`: 31 ```Nix 32 { config, lib, pkgs, ... }: 33 { ··· 42 } 43 ``` 44 45 + Use `lib.mkForce` to forcefully specify the overridden package. 46 ''; 47 }; 48 enableFakeroot = mkOption {
+1 -1
nixos/modules/programs/turbovnc.nix
··· 39 config = mkIf cfg.ensureHeadlessSoftwareOpenGL { 40 41 # TurboVNC has builtin support for Mesa llvmpipe's `swrast` 42 - # software rendering to implemnt GLX (OpenGL on Xorg). 43 # However, just building TurboVNC with support for that is not enough 44 # (it only takes care of the X server side part of OpenGL); 45 # the indiviudual applications (e.g. `glxgears`) also need to directly load
··· 39 config = mkIf cfg.ensureHeadlessSoftwareOpenGL { 40 41 # TurboVNC has builtin support for Mesa llvmpipe's `swrast` 42 + # software rendering to implement GLX (OpenGL on Xorg). 43 # However, just building TurboVNC with support for that is not enough 44 # (it only takes care of the X server side part of OpenGL); 45 # the indiviudual applications (e.g. `glxgears`) also need to directly load
+1 -1
nixos/modules/rename.nix
··· 112 (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") 113 (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") 114 115 - (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Plesae use fcitx5 instead") 116 117 # Do NOT add any option renames here, see top of the file 118 ];
··· 112 (mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.") 113 (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.") 114 115 + (mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead") 116 117 # Do NOT add any option renames here, see top of the file 118 ];
+1 -1
nixos/modules/services/cluster/kubernetes/flannel.nix
··· 53 }; 54 }; 55 56 - # give flannel som kubernetes rbac permissions if applicable 57 services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { 58 59 flannel-cr = {
··· 53 }; 54 }; 55 56 + # give flannel some kubernetes rbac permissions if applicable 57 services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { 58 59 flannel-cr = {
+1 -1
nixos/modules/services/cluster/kubernetes/kubelet.nix
··· 337 }; 338 }; 339 340 - # Allways include cni plugins 341 services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins pkgs.cni-plugin-flannel]; 342 343 boot.kernelModules = ["br_netfilter" "overlay"];
··· 337 }; 338 }; 339 340 + # Always include cni plugins 341 services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins pkgs.cni-plugin-flannel]; 342 343 boot.kernelModules = ["br_netfilter" "overlay"];
+1 -1
nixos/modules/services/continuous-integration/gitea-actions-runner.nix
··· 207 export LABELS_CURRENT="$(cat $LABELS_FILE 2>/dev/null || echo 0)" 208 209 if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ]; then 210 - # remove existing registration file, so that changing the labels forces a re-registation 211 rm -v "$INSTANCE_DIR/.runner" || true 212 213 # perform the registration
··· 207 export LABELS_CURRENT="$(cat $LABELS_FILE 2>/dev/null || echo 0)" 208 209 if [ ! -e "$INSTANCE_DIR/.runner" ] || [ "$LABELS_WANTED" != "$LABELS_CURRENT" ]; then 210 + # remove existing registration file, so that changing the labels forces a re-registration 211 rm -v "$INSTANCE_DIR/.runner" || true 212 213 # perform the registration
+1 -1
nixos/modules/services/continuous-integration/woodpecker/agents.nix
··· 23 DOCKER_HOST = "unix:///run/podman/podman.sock"; 24 } 25 ''; 26 - description = lib.mdDoc "woodpecker-agent config envrionment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/agent-config)"; 27 }; 28 29 extraGroups = lib.mkOption {
··· 23 DOCKER_HOST = "unix:///run/podman/podman.sock"; 24 } 25 ''; 26 + description = lib.mdDoc "woodpecker-agent config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/agent-config)"; 27 }; 28 29 extraGroups = lib.mkOption {
+1 -1
nixos/modules/services/continuous-integration/woodpecker/server.nix
··· 28 WOODPECKER_GITEA_URL = "https://git.example.com"; 29 } 30 ''; 31 - description = lib.mdDoc "woodpecker-server config envrionment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)"; 32 }; 33 environmentFile = lib.mkOption { 34 type = lib.types.nullOr lib.types.path;
··· 28 WOODPECKER_GITEA_URL = "https://git.example.com"; 29 } 30 ''; 31 + description = lib.mdDoc "woodpecker-server config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)"; 32 }; 33 environmentFile = lib.mkOption { 34 type = lib.types.nullOr lib.types.path;
+1 -1
nixos/modules/services/databases/cockroachdb.nix
··· 164 example = [ "--advertise-addr" "[fe80::f6f2:::]" ]; 165 description = lib.mdDoc '' 166 Extra CLI arguments passed to {command}`cockroach start`. 167 - For the full list of supported argumemnts, check <https://www.cockroachlabs.com/docs/stable/cockroach-start.html#flags> 168 ''; 169 }; 170 };
··· 164 example = [ "--advertise-addr" "[fe80::f6f2:::]" ]; 165 description = lib.mdDoc '' 166 Extra CLI arguments passed to {command}`cockroach start`. 167 + For the full list of supported arguments, check <https://www.cockroachlabs.com/docs/stable/cockroach-start.html#flags> 168 ''; 169 }; 170 };
+1 -1
nixos/modules/services/databases/couchdb.nix
··· 141 type = types.lines; 142 default = ""; 143 description = lib.mdDoc '' 144 - Extra configuration. Overrides any other cofiguration. 145 ''; 146 }; 147
··· 141 type = types.lines; 142 default = ""; 143 description = lib.mdDoc '' 144 + Extra configuration. Overrides any other configuration. 145 ''; 146 }; 147
+1 -1
nixos/modules/services/databases/firebird.nix
··· 1 { config, lib, pkgs, ... }: 2 3 - # TODO: This may file may need additional review, eg which configuartions to 4 # expose to the user. 5 # 6 # I only used it to access some simple databases.
··· 1 { config, lib, pkgs, ... }: 2 3 + # TODO: This may file may need additional review, eg which configurations to 4 # expose to the user. 5 # 6 # I only used it to access some simple databases.
+1 -1
nixos/modules/services/databases/mongodb.nix
··· 142 User = cfg.user; 143 PIDFile = cfg.pidFile; 144 Type = "forking"; 145 - TimeoutStartSec=120; # intial creating of journal can take some time 146 PermissionsStartOnly = true; 147 }; 148
··· 142 User = cfg.user; 143 PIDFile = cfg.pidFile; 144 Type = "forking"; 145 + TimeoutStartSec=120; # initial creating of journal can take some time 146 PermissionsStartOnly = true; 147 }; 148
+1 -1
nixos/modules/services/desktops/deepin/dde-api.nix
··· 16 17 enable = mkEnableOption (lib.mdDoc '' 18 Provides some dbus interfaces that is used for screen zone detecting, 19 - thumbnail generating, and sound playing in Deepin Desktop Enviroment. 20 ''); 21 22 };
··· 16 17 enable = mkEnableOption (lib.mdDoc '' 18 Provides some dbus interfaces that is used for screen zone detecting, 19 + thumbnail generating, and sound playing in Deepin Desktop Environment. 20 ''); 21 22 };
+1 -1
nixos/modules/services/mail/roundcube.nix
··· 72 type = types.str; 73 description = lib.mdDoc '' 74 Password file for the postgresql connection. 75 - Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html) 76 but only one line, no comments and readable by user `nginx`. 77 Ignored if `database.host` is set to `localhost`, as peer authentication will be used. 78 '';
··· 72 type = types.str; 73 description = lib.mdDoc '' 74 Password file for the postgresql connection. 75 + Must be formatted according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html) 76 but only one line, no comments and readable by user `nginx`. 77 Ignored if `database.host` is set to `localhost`, as peer authentication will be used. 78 '';
+3 -3
nixos/modules/services/misc/siproxd.nix
··· 60 default = [ ]; 61 example = [ "192.168.1.0/24" "192.168.2.0/24" ]; 62 description = lib.mdDoc '' 63 - Acess control list for incoming SIP registrations. 64 ''; 65 }; 66 ··· 69 default = [ ]; 70 example = [ "123.45.0.0/16" "123.46.0.0/16" ]; 71 description = lib.mdDoc '' 72 - Acess control list for incoming SIP traffic. 73 ''; 74 }; 75 ··· 78 default = [ ]; 79 example = [ "10.0.0.0/8" "11.0.0.0/8" ]; 80 description = lib.mdDoc '' 81 - Acess control list for denying incoming 82 SIP registrations and traffic. 83 ''; 84 };
··· 60 default = [ ]; 61 example = [ "192.168.1.0/24" "192.168.2.0/24" ]; 62 description = lib.mdDoc '' 63 + Access control list for incoming SIP registrations. 64 ''; 65 }; 66 ··· 69 default = [ ]; 70 example = [ "123.45.0.0/16" "123.46.0.0/16" ]; 71 description = lib.mdDoc '' 72 + Access control list for incoming SIP traffic. 73 ''; 74 }; 75 ··· 78 default = [ ]; 79 example = [ "10.0.0.0/8" "11.0.0.0/8" ]; 80 description = lib.mdDoc '' 81 + Access control list for denying incoming 82 SIP registrations and traffic. 83 ''; 84 };
+1 -1
nixos/modules/services/monitoring/prometheus/default.nix
··· 1614 1615 The following property holds: switching to a configuration 1616 (`switch-to-configuration`) that changes the prometheus 1617 - configuration only finishes successully when prometheus has finished 1618 loading the new configuration. 1619 ''; 1620 };
··· 1614 1615 The following property holds: switching to a configuration 1616 (`switch-to-configuration`) that changes the prometheus 1617 + configuration only finishes successfully when prometheus has finished 1618 loading the new configuration. 1619 ''; 1620 };
+2 -2
nixos/modules/services/monitoring/unpoller.nix
··· 47 type = types.bool; 48 default = false; 49 description = lib.mdDoc '' 50 - Whether to disable the prometheus ouput plugin. 51 ''; 52 }; 53 http_listen = mkOption { ··· 71 type = types.bool; 72 default = false; 73 description = lib.mdDoc '' 74 - Whether to disable the influxdb ouput plugin. 75 ''; 76 }; 77 url = mkOption {
··· 47 type = types.bool; 48 default = false; 49 description = lib.mdDoc '' 50 + Whether to disable the prometheus output plugin. 51 ''; 52 }; 53 http_listen = mkOption { ··· 71 type = types.bool; 72 default = false; 73 description = lib.mdDoc '' 74 + Whether to disable the influxdb output plugin. 75 ''; 76 }; 77 url = mkOption {
+1 -1
nixos/modules/services/networking/headscale.nix
··· 393 type = types.nullOr types.path; 394 default = null; 395 description = lib.mdDoc '' 396 - Path to a file containg ACL policies. 397 ''; 398 }; 399 };
··· 393 type = types.nullOr types.path; 394 default = null; 395 description = lib.mdDoc '' 396 + Path to a file containing ACL policies. 397 ''; 398 }; 399 };
+1 -1
nixos/modules/services/networking/wgautomesh.nix
··· 94 address = mkOption { 95 type = types.str; 96 description = mdDoc '' 97 - Wireguard address of this peer (a single IP address, multliple 98 addresses or address ranges are not supported). 99 ''; 100 example = "10.0.0.42";
··· 94 address = mkOption { 95 type = types.str; 96 description = mdDoc '' 97 + Wireguard address of this peer (a single IP address, multiple 98 addresses or address ranges are not supported). 99 ''; 100 example = "10.0.0.42";
+1 -1
nixos/modules/services/search/meilisearch.md
··· 30 31 - The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time. 32 33 - - Anonimized Analytics sent to meilisearch are disabled by default. 34 35 - Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible. 36
··· 30 31 - The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time. 32 33 + - Anonymized Analytics sent to meilisearch are disabled by default. 34 35 - Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible. 36
+1 -1
nixos/modules/services/security/authelia.nix
··· 72 type = types.nullOr types.path; 73 default = null; 74 description = mdDoc '' 75 - Path to your JWT secret used during identity verificaiton. 76 ''; 77 }; 78
··· 72 type = types.nullOr types.path; 73 default = null; 74 description = mdDoc '' 75 + Path to your JWT secret used during identity verificaton. 76 ''; 77 }; 78
+1 -1
nixos/modules/services/security/kanidm.nix
··· 10 certPaths = builtins.map builtins.dirOf [ cfg.serverSettings.tls_chain cfg.serverSettings.tls_key ]; 11 12 # Merge bind mount paths and remove paths where a prefix is already mounted. 13 - # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is alread in the mount 14 # paths, no new bind mount is added. Adding subpaths caused problems on ofborg. 15 hasPrefixInList = list: newPath: lib.any (path: lib.hasPrefix (builtins.toString path) (builtins.toString newPath)) list; 16 mergePaths = lib.foldl' (merged: newPath: let
··· 10 certPaths = builtins.map builtins.dirOf [ cfg.serverSettings.tls_chain cfg.serverSettings.tls_key ]; 11 12 # Merge bind mount paths and remove paths where a prefix is already mounted. 13 + # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount 14 # paths, no new bind mount is added. Adding subpaths caused problems on ofborg. 15 hasPrefixInList = list: newPath: lib.any (path: lib.hasPrefix (builtins.toString path) (builtins.toString newPath)) list; 16 mergePaths = lib.foldl' (merged: newPath: let
+1 -1
nixos/modules/services/web-apps/dokuwiki.nix
··· 173 } 174 { 175 assertion = config.usersFile != null -> config.mergedConfig.useacl != false; 176 - message = "${showPath [ "settings" "useacl" ]} is required when ${showPath [ "usersFile" ]} is set (Currently defiend as `${config.usersFile}' in ${showFiles options.usersFile.files})."; 177 } 178 ]; 179 })
··· 173 } 174 { 175 assertion = config.usersFile != null -> config.mergedConfig.useacl != false; 176 + message = "${showPath [ "settings" "useacl" ]} is required when ${showPath [ "usersFile" ]} is set (Currently defined as `${config.usersFile}' in ${showFiles options.usersFile.files})."; 177 } 178 ]; 179 })
+1 -1
nixos/modules/services/web-apps/kavita.nix
··· 35 ipAdresses = lib.mkOption { 36 default = ["0.0.0.0" "::"]; 37 type = lib.types.listOf lib.types.str; 38 - description = lib.mdDoc "IP Adresses to bind to. The default is to bind 39 to all IPv4 and IPv6 addresses."; 40 }; 41 };
··· 35 ipAdresses = lib.mkOption { 36 default = ["0.0.0.0" "::"]; 37 type = lib.types.listOf lib.types.str; 38 + description = lib.mdDoc "IP Addresses to bind to. The default is to bind 39 to all IPv4 and IPv6 addresses."; 40 }; 41 };
+1 -1
nixos/modules/services/web-apps/mastodon.nix
··· 508 type = with lib.types; listOf path; 509 default = []; 510 description = lib.mdDoc '' 511 - Extra environment files to pass to all mastodon services. Useful for passing down environemntal secrets. 512 ''; 513 example = [ "/etc/mastodon/s3config.env" ]; 514 };
··· 508 type = with lib.types; listOf path; 509 default = []; 510 description = lib.mdDoc '' 511 + Extra environment files to pass to all mastodon services. Useful for passing down environmental secrets. 512 ''; 513 example = [ "/etc/mastodon/s3config.env" ]; 514 };
+1 -1
nixos/modules/services/web-apps/monica.nix
··· 367 }; 368 369 systemd.services.monica-setup = { 370 - description = "Preperation tasks for monica"; 371 before = ["phpfpm-monica.service"]; 372 after = optional db.createLocally "mysql.service"; 373 wantedBy = ["multi-user.target"];
··· 367 }; 368 369 systemd.services.monica-setup = { 370 + description = "Preparation tasks for monica"; 371 before = ["phpfpm-monica.service"]; 372 after = optional db.createLocally "mysql.service"; 373 wantedBy = ["multi-user.target"];
+1 -1
nixos/modules/services/web-apps/nextcloud-notify_push.nix
··· 31 type = lib.types.bool; 32 default = false; 33 description = lib.mdDoc '' 34 - Wether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option. 35 36 This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket. 37 '';
··· 31 type = lib.types.bool; 32 default = false; 33 description = lib.mdDoc '' 34 + Whether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option. 35 36 This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket. 37 '';
+1 -1
nixos/modules/services/web-apps/nextcloud.nix
··· 556 default = config.services.nextcloud.notify_push.enable; 557 defaultText = literalExpression "config.services.nextcloud.notify_push.enable"; 558 description = lib.mdDoc '' 559 - Wether to configure nextcloud to use the recommended redis settings for small instances. 560 561 ::: {.note} 562 The `notify_push` app requires redis to be configured. If this option is turned off, this must be configured manually.
··· 556 default = config.services.nextcloud.notify_push.enable; 557 defaultText = literalExpression "config.services.nextcloud.notify_push.enable"; 558 description = lib.mdDoc '' 559 + Whether to configure nextcloud to use the recommended redis settings for small instances. 560 561 ::: {.note} 562 The `notify_push` app requires redis to be configured. If this option is turned off, this must be configured manually.
+1 -1
nixos/modules/services/web-apps/pixelfed.nix
··· 237 QUEUE_DRIVER = mkDefault "redis"; 238 SESSION_DRIVER = mkDefault "redis"; 239 WEBSOCKET_REPLICATION_MODE = mkDefault "redis"; 240 - # Suppport phpredis and predis configuration-style. 241 REDIS_SCHEME = "unix"; 242 REDIS_HOST = config.services.redis.servers.pixelfed.unixSocket; 243 REDIS_PATH = config.services.redis.servers.pixelfed.unixSocket;
··· 237 QUEUE_DRIVER = mkDefault "redis"; 238 SESSION_DRIVER = mkDefault "redis"; 239 WEBSOCKET_REPLICATION_MODE = mkDefault "redis"; 240 + # Support phpredis and predis configuration-style. 241 REDIS_SCHEME = "unix"; 242 REDIS_HOST = config.services.redis.servers.pixelfed.unixSocket; 243 REDIS_PATH = config.services.redis.servers.pixelfed.unixSocket;
+1 -1
nixos/modules/services/web-servers/garage.md
··· 77 on fresh setups. 78 79 If major-releases will be abandoned by upstream, we should check first if those are needed 80 - in NixOS for a safe upgrade-path before removing those. In that case we shold keep those 81 packages, but mark them as insecure in an expression like this (in 82 `<nixpkgs/pkgs/tools/filesystem/garage/default.nix>`): 83 ```
··· 77 on fresh setups. 78 79 If major-releases will be abandoned by upstream, we should check first if those are needed 80 + in NixOS for a safe upgrade-path before removing those. In that case we should keep those 81 packages, but mark them as insecure in an expression like this (in 82 `<nixpkgs/pkgs/tools/filesystem/garage/default.nix>`): 83 ```
+1 -1
nixos/modules/services/web-servers/stargazer.nix
··· 152 153 Expressed as a list of attribute sets. Each set must have a key `route` 154 that becomes the section name for that route in the stargazer ini cofig. 155 - The remaining keys and vaules become the parameters for that route. 156 157 [Refer to upstream docs for other params](https://git.sr.ht/~zethra/stargazer/tree/main/item/doc/stargazer.ini.5.txt) 158 '';
··· 152 153 Expressed as a list of attribute sets. Each set must have a key `route` 154 that becomes the section name for that route in the stargazer ini cofig. 155 + The remaining keys and values become the parameters for that route. 156 157 [Refer to upstream docs for other params](https://git.sr.ht/~zethra/stargazer/tree/main/item/doc/stargazer.ini.5.txt) 158 '';
+1 -1
nixos/modules/services/x11/window-managers/qtile.nix
··· 40 description = lib.mdDoc '' 41 Extra Python packages available to Qtile. 42 An example would be to include `python3Packages.qtile-extras` 43 - for additional unoffical widgets. 44 ''; 45 example = literalExpression '' 46 python3Packages: with python3Packages; [
··· 40 description = lib.mdDoc '' 41 Extra Python packages available to Qtile. 42 An example would be to include `python3Packages.qtile-extras` 43 + for additional unofficial widgets. 44 ''; 45 example = literalExpression '' 46 python3Packages: with python3Packages; [
+2 -2
nixos/modules/system/boot/loader/grub/install-grub.pl
··· 213 $search .= $matches[0]; 214 } 215 216 - # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes 217 if ($fs->type eq 'btrfs') { 218 my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); 219 if ($status != 0) { ··· 586 if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } 587 else { return "both" } 588 } elsif (($grub ne "") && ($grubEfi eq "")) { 589 - # TODO: It would be safer to disallow non-EFI grub installation if no taget is given. 590 # If no target is given, then grub auto-detects the target which can lead to errors. 591 # E.g. it seems as if grub would auto-detect a EFI target based on the availability 592 # of a EFI partition.
··· 213 $search .= $matches[0]; 214 } 215 216 + # BTRFS is a special case in that we need to fix the referenced path based on subvolumes 217 if ($fs->type eq 'btrfs') { 218 my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); 219 if ($status != 0) { ··· 586 if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } 587 else { return "both" } 588 } elsif (($grub ne "") && ($grubEfi eq "")) { 589 + # TODO: It would be safer to disallow non-EFI grub installation if no target is given. 590 # If no target is given, then grub auto-detects the target which can lead to errors. 591 # E.g. it seems as if grub would auto-detect a EFI target based on the availability 592 # of a EFI partition.
+2 -2
nixos/modules/system/boot/luksroot.nix
··· 130 ''} 131 132 # Disable all input echo for the whole stage. We could use read -s 133 - # instead but that would ocasionally leak characters between read 134 # invocations. 135 stty -echo 136 ''; ··· 861 ''; 862 description = lib.mdDoc '' 863 Commands that should be run right before we try to mount our LUKS device. 864 - This can be useful, if the keys needed to open the drive is on another partion. 865 ''; 866 }; 867
··· 130 ''} 131 132 # Disable all input echo for the whole stage. We could use read -s 133 + # instead but that would occasionally leak characters between read 134 # invocations. 135 stty -echo 136 ''; ··· 861 ''; 862 description = lib.mdDoc '' 863 Commands that should be run right before we try to mount our LUKS device. 864 + This can be useful, if the keys needed to open the drive is on another partition. 865 ''; 866 }; 867
+1 -1
nixos/modules/system/boot/stage-1-init.sh
··· 445 mv -v "$d" "$root/old-root.tmp" 446 done 447 448 - # Use .tmp to make sure subsequent invokations don't clash 449 mv -v "$root/old-root.tmp" "$root/old-root" 450 451 mkdir -m 0755 -p "$root/etc"
··· 445 mv -v "$d" "$root/old-root.tmp" 446 done 447 448 + # Use .tmp to make sure subsequent invocations don't clash 449 mv -v "$root/old-root.tmp" "$root/old-root" 450 451 mkdir -m 0755 -p "$root/etc"
+1 -1
nixos/modules/tasks/filesystems/bcachefs.nix
··· 16 local path="$2" 17 if bcachefs unlock -c $path > /dev/null 2> /dev/null; then # test for encryption 18 prompt $name 19 - until bcachefs unlock $path 2> /dev/null; do # repeat until sucessfully unlocked 20 printf "unlocking failed!\n" 21 prompt $name 22 done
··· 16 local path="$2" 17 if bcachefs unlock -c $path > /dev/null 2> /dev/null; then # test for encryption 18 prompt $name 19 + until bcachefs unlock $path 2> /dev/null; do # repeat until successfully unlocked 20 printf "unlocking failed!\n" 21 prompt $name 22 done
+1 -1
nixos/modules/tasks/filesystems/btrfs.nix
··· 25 type = types.listOf types.path; 26 example = [ "/" ]; 27 description = lib.mdDoc '' 28 - List of paths to btrfs filesystems to regularily call {command}`btrfs scrub` on. 29 Defaults to all mount points with btrfs filesystems. 30 If you mount a filesystem multiple times or additionally mount subvolumes, 31 you need to manually specify this list to avoid scrubbing multiple times.
··· 25 type = types.listOf types.path; 26 example = [ "/" ]; 27 description = lib.mdDoc '' 28 + List of paths to btrfs filesystems to regularly call {command}`btrfs scrub` on. 29 Defaults to all mount points with btrfs filesystems. 30 If you mount a filesystem multiple times or additionally mount subvolumes, 31 you need to manually specify this list to avoid scrubbing multiple times.
+1 -1
nixos/modules/tasks/network-interfaces-scripted.nix
··· 396 ''; 397 postStop = '' 398 echo "Cleaning Open vSwitch ${n}" 399 - echo "Shuting down internal ${n} interface" 400 ip link set ${n} down || true 401 echo "Deleting flows for ${n}" 402 ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
··· 396 ''; 397 postStop = '' 398 echo "Cleaning Open vSwitch ${n}" 399 + echo "Shutting down internal ${n} interface" 400 ip link set ${n} down || true 401 echo "Deleting flows for ${n}" 402 ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+1 -1
nixos/modules/tasks/network-interfaces-systemd.nix
··· 437 ''; 438 postStop = '' 439 echo "Cleaning Open vSwitch ${n}" 440 - echo "Shuting down internal ${n} interface" 441 ip link set ${n} down || true 442 echo "Deleting flows for ${n}" 443 ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
··· 437 ''; 438 postStop = '' 439 echo "Cleaning Open vSwitch ${n}" 440 + echo "Shutting down internal ${n} interface" 441 ip link set ${n} down || true 442 echo "Deleting flows for ${n}" 443 ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+1 -1
nixos/modules/testing/test-instrumentation.nix
··· 43 # Passing the terminal device makes bash run non-interactively. 44 # Otherwise we get errors on the terminal because bash tries to 45 # setup things like job control. 46 - # Note: calling bash explicitely here instead of sh makes sure that 47 # we can also run non-NixOS guests during tests. 48 PS1= exec /usr/bin/env bash --norc /dev/hvc0 49 '';
··· 43 # Passing the terminal device makes bash run non-interactively. 44 # Otherwise we get errors on the terminal because bash tries to 45 # setup things like job control. 46 + # Note: calling bash explicitly here instead of sh makes sure that 47 # we can also run non-NixOS guests during tests. 48 PS1= exec /usr/bin/env bash --norc /dev/hvc0 49 '';
+1 -1
nixos/tests/acme.nix
··· 407 # Ensures the issuer of our cert matches the chain 408 # and matches the issuer we expect it to be. 409 # It's a good validation to ensure the cert.pem and fullchain.pem 410 - # are not still selfsigned afer verification 411 def check_issuer(node, cert_name, issuer): 412 for fname in ("cert.pem", "fullchain.pem"): 413 actual_issuer = node.succeed(
··· 407 # Ensures the issuer of our cert matches the chain 408 # and matches the issuer we expect it to be. 409 # It's a good validation to ensure the cert.pem and fullchain.pem 410 + # are not still selfsigned after verification 411 def check_issuer(node, cert_name, issuer): 412 for fname in ("cert.pem", "fullchain.pem"): 413 actual_issuer = node.succeed(
+1 -1
nixos/tests/atop.nix
··· 199 ]; 200 }; 201 everything = makeTest { 202 - name = "atop-everthing"; 203 nodes.machine = { 204 programs.atop = { 205 enable = true;
··· 199 ]; 200 }; 201 everything = makeTest { 202 + name = "atop-everything"; 203 nodes.machine = { 204 programs.atop = { 205 enable = true;
+1 -1
nixos/tests/boot-stage1.nix
··· 132 ''; 133 }) 134 135 - # This canary process mimicks a storage daemon, which we do NOT want to be 136 # killed before going into stage 2. For more on root storage daemons, see: 137 # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ 138 (mkCmdlineCanary {
··· 132 ''; 133 }) 134 135 + # This canary process mimics a storage daemon, which we do NOT want to be 136 # killed before going into stage 2. For more on root storage daemons, see: 137 # https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ 138 (mkCmdlineCanary {
+2 -2
nixos/tests/cockpit.nix
··· 93 password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') 94 set_value(password_input, "${password}") 95 96 - log("Submiting credentials for login") 97 driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() 98 99 # driver.implicitly_wait(1) ··· 102 log("Waiting dashboard to load") 103 wait_title_contains("${user}@server") 104 105 - log("Waiting for the frontend to initalize") 106 sleep(1) 107 108 log("Looking for that banner that tells about limited access")
··· 93 password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') 94 set_value(password_input, "${password}") 95 96 + log("Submitting credentials for login") 97 driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() 98 99 # driver.implicitly_wait(1) ··· 102 log("Waiting dashboard to load") 103 wait_title_contains("${user}@server") 104 105 + log("Waiting for the frontend to initialize") 106 sleep(1) 107 108 log("Looking for that banner that tells about limited access")
+1 -1
nixos/tests/dokuwiki.nix
··· 143 "curl -sSfL 'http://site2.local/doku.php?id=plugin-list' | (! grep 'plugin:tag')", 144 ) 145 146 - # Test if theme is applied and working correctly (no weired relative PHP import errors) 147 machine.succeed( 148 "curl -sSfL 'http://site1.local/doku.php' | grep 'bootstrap3/images/logo.png'", 149 "curl -sSfL 'http://site1.local/lib/exe/css.php' | grep 'bootstrap3'",
··· 143 "curl -sSfL 'http://site2.local/doku.php?id=plugin-list' | (! grep 'plugin:tag')", 144 ) 145 146 + # Test if theme is applied and working correctly (no weird relative PHP import errors) 147 machine.succeed( 148 "curl -sSfL 'http://site1.local/doku.php' | grep 'bootstrap3/images/logo.png'", 149 "curl -sSfL 'http://site1.local/lib/exe/css.php' | grep 'bootstrap3'",
+1 -1
nixos/tests/elk.nix
··· 1 - # To run the test on the unfree ELK use the folllowing command: 2 # cd path/to/nixpkgs 3 # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6 4
··· 1 + # To run the test on the unfree ELK use the following command: 2 # cd path/to/nixpkgs 3 # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6 4
+1 -1
nixos/tests/enlightenment.nix
··· 65 machine.screenshot("wizard7") 66 machine.succeed("xdotool mousemove 512 740 click 1") # Next 67 68 - machine.wait_for_text("BlusZ") # Bluetooh Management (default) 69 machine.screenshot("wizard8") 70 machine.succeed("xdotool mousemove 512 740 click 1") # Next 71
··· 65 machine.screenshot("wizard7") 66 machine.succeed("xdotool mousemove 512 740 click 1") # Next 67 68 + machine.wait_for_text("BlusZ") # Bluetooth Management (default) 69 machine.screenshot("wizard8") 70 machine.succeed("xdotool mousemove 512 740 click 1") # Next 71
+1 -1
nixos/tests/gnome.nix
··· 39 }; 40 41 testScript = { nodes, ... }: let 42 - # Keep line widths somewhat managable 43 user = nodes.machine.config.users.users.alice; 44 uid = toString user.uid; 45 bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
··· 39 }; 40 41 testScript = { nodes, ... }: let 42 + # Keep line widths somewhat manageable 43 user = nodes.machine.config.users.users.alice; 44 uid = toString user.uid; 45 bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
+1 -1
nixos/tests/gotify-server.nix
··· 42 43 assert title == "Gotify" 44 45 - # Ensure that the UI responds with a successfuly code and that the 46 # response is not empty 47 result = machine.succeed("curl -fsS localhost:3000") 48 assert result, "HTTP response from localhost:3000 must not be empty!"
··· 42 43 assert title == "Gotify" 44 45 + # Ensure that the UI responds with a successful code and that the 46 # response is not empty 47 result = machine.succeed("curl -fsS localhost:3000") 48 assert result, "HTTP response from localhost:3000 must not be empty!"
+1 -1
nixos/tests/headscale.nix
··· 10 testScript = '' 11 machine.wait_for_unit("headscale") 12 machine.wait_for_open_port(8080) 13 - # Test basic funcionality 14 machine.succeed("headscale namespaces create test") 15 machine.succeed("headscale preauthkeys -u test create") 16 '';
··· 10 testScript = '' 11 machine.wait_for_unit("headscale") 12 machine.wait_for_open_port(8080) 13 + # Test basic functionality 14 machine.succeed("headscale namespaces create test") 15 machine.succeed("headscale preauthkeys -u test create") 16 '';
+1 -1
nixos/tests/hockeypuck.nix
··· 57 # Send the key to our local keyserver 58 machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId) 59 60 - # Recieve the key from our local keyserver to a separate directory 61 machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId) 62 ''; 63 })
··· 57 # Send the key to our local keyserver 58 machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId) 59 60 + # Receive the key from our local keyserver to a separate directory 61 machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId) 62 ''; 63 })
+1 -1
nixos/tests/logrotate.nix
··· 38 priority = 2000; 39 shred = true; 40 }; 41 - # using mail somewhere should add --mail to logrotate invokation 42 sendmail = { 43 mail = "user@domain.tld"; 44 };
··· 38 priority = 2000; 39 shred = true; 40 }; 41 + # using mail somewhere should add --mail to logrotate invocation 42 sendmail = { 43 mail = "user@domain.tld"; 44 };
+1 -1
nixos/tests/nextcloud/openssl-sse.nix
··· 73 nextcloudwithopenssl1.succeed("nextcloud-occ status") 74 75 with subtest("Existing encrypted files cannot be read, but new files can be added"): 76 - # This will succed starting NC26 because of their custom implementation of openssl_seal 77 read_existing_file_test = nextcloudwithopenssl1.fail if nextcloud_version < 26 else nextcloudwithopenssl1.succeed 78 read_existing_file_test("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file >&2") 79 nextcloudwithopenssl1.succeed("nextcloud-occ encryption:disable")
··· 73 nextcloudwithopenssl1.succeed("nextcloud-occ status") 74 75 with subtest("Existing encrypted files cannot be read, but new files can be added"): 76 + # This will succeed starting NC26 because of their custom implementation of openssl_seal 77 read_existing_file_test = nextcloudwithopenssl1.fail if nextcloud_version < 26 else nextcloudwithopenssl1.succeed 78 read_existing_file_test("${withRcloneEnv3} ${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file >&2") 79 nextcloudwithopenssl1.succeed("nextcloud-occ encryption:disable")
+1 -1
nixos/tests/orangefs.nix
··· 62 "sudo -g orangefs -u orangefs pvfs2-server -f /etc/orangefs/server.conf" 63 ) 64 65 - # start services after storage is formated on all machines 66 for server in server1, server2: 67 server.succeed("systemctl start orangefs-server.service") 68
··· 62 "sudo -g orangefs -u orangefs pvfs2-server -f /etc/orangefs/server.conf" 63 ) 64 65 + # start services after storage is formatted on all machines 66 for server in server1, server2: 67 server.succeed("systemctl start orangefs-server.service") 68
+1 -1
nixos/tests/signal-desktop.nix
··· 43 machine.execute("su - alice -c signal-desktop >&2 &") 44 45 # Wait for the Signal window to appear. Since usually the tests 46 - # are run sandboxed and therfore with no internet, we can not wait 47 # for the message "Link your phone ...". Nor should we wait for 48 # the "Failed to connect to server" message, because when manually 49 # running this test it will be not sandboxed.
··· 43 machine.execute("su - alice -c signal-desktop >&2 &") 44 45 # Wait for the Signal window to appear. Since usually the tests 46 + # are run sandboxed and therefore with no internet, we can not wait 47 # for the message "Link your phone ...". Nor should we wait for 48 # the "Failed to connect to server" message, because when manually 49 # running this test it will be not sandboxed.
+2 -2
nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
··· 1 # This test verifies that we can request and assign IPv6 prefixes from upstream 2 # (e.g. ISP) routers. 3 - # The setup consits of three VMs. One for the ISP, as your residential router 4 # and the third as a client machine in the residential network. 5 # 6 # There are two VLANs in this test: ··· 268 systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; 269 }; 270 271 - # This is the client behind the router. We should be receving router 272 # advertisements for both the ULA and the delegated prefix. 273 # All we have to do is boot with the default (networkd) configuration. 274 client = {
··· 1 # This test verifies that we can request and assign IPv6 prefixes from upstream 2 # (e.g. ISP) routers. 3 + # The setup consists of three VMs. One for the ISP, as your residential router 4 # and the third as a client machine in the residential network. 5 # 6 # There are two VLANs in this test: ··· 268 systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; 269 }; 270 271 + # This is the client behind the router. We should be receiving router 272 # advertisements for both the ULA and the delegated prefix. 273 # All we have to do is boot with the default (networkd) configuration. 274 client = {
+1 -1
nixos/tests/systemd-repart.nix
··· 9 let 10 # A testScript fragment that prepares a disk with some empty, unpartitioned 11 # space. and uses it to boot the test with. Takes a single argument `machine` 12 - # from which the diskImage is extraced. 13 useDiskImage = machine: '' 14 import os 15 import shutil
··· 9 let 10 # A testScript fragment that prepares a disk with some empty, unpartitioned 11 # space. and uses it to boot the test with. Takes a single argument `machine` 12 + # from which the diskImage is extracted. 13 useDiskImage = machine: '' 14 import os 15 import shutil
+2 -2
nixos/tests/unbound.nix
··· 1 /* 2 Test that our unbound module indeed works as most users would expect. 3 There are a few settings that we must consider when modifying the test. The 4 - ususal use-cases for unbound are 5 * running a recursive DNS resolver on the local machine 6 * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53 7 * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT) ··· 74 }; 75 }; 76 77 - # The resolver that knows that fowards (only) to the authoritative server 78 # and listens on UDP/53, TCP/53 & TCP/853. 79 resolver = { lib, nodes, ... }: { 80 imports = [ common ];
··· 1 /* 2 Test that our unbound module indeed works as most users would expect. 3 There are a few settings that we must consider when modifying the test. The 4 + usual use-cases for unbound are 5 * running a recursive DNS resolver on the local machine 6 * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via UDP/53 & TCP/53 7 * running a recursive DNS resolver on the local machine, forwarding to a local DNS server via TCP/853 (DoT) ··· 74 }; 75 }; 76 77 + # The resolver that knows that forwards (only) to the authoritative server 78 # and listens on UDP/53, TCP/53 & TCP/853. 79 resolver = { lib, nodes, ... }: { 80 imports = [ common ];
+1 -1
pkgs/applications/audio/proteus/default.nix
··· 26 env.NIX_CFLAGS_COMPILE = toString [ 27 # Support JACK output in the standalone application: 28 "-DJUCE_JACK" 29 - # Accomodate -flto: 30 "-ffat-lto-objects" 31 ]; 32
··· 26 env.NIX_CFLAGS_COMPILE = toString [ 27 # Support JACK output in the standalone application: 28 "-DJUCE_JACK" 29 + # Accommodate -flto: 30 "-ffat-lto-objects" 31 ]; 32
+1 -1
pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh
··· 14 # - run their '--version' and call 'ldd' 15 # - print the version of the runtime deps nix replacements. 16 # 17 - # TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps). 18 # TODO: Print x86 and maybe darwin runtime dependencies. 19 # 20
··· 14 # - run their '--version' and call 'ldd' 15 # - print the version of the runtime deps nix replacements. 16 # 17 + # TODO: Print to a properly formatted nix file all the required information to fetch everything (extension + runtime deps). 18 # TODO: Print x86 and maybe darwin runtime dependencies. 19 # 20
+1 -1
pkgs/applications/editors/vscode/generic.nix
··· 192 193 meta = meta // { 194 description = '' 195 - Wrapped variant of ${pname} which launches in a FHS compatible envrionment. 196 Should allow for easy usage of extensions without nix-specific modifications. 197 ''; 198 };
··· 192 193 meta = meta // { 194 description = '' 195 + Wrapped variant of ${pname} which launches in a FHS compatible environment. 196 Should allow for easy usage of extensions without nix-specific modifications. 197 ''; 198 };
+1 -1
pkgs/applications/networking/irc/quassel/default.nix
··· 78 79 meta = with lib; { 80 homepage = "https://quassel-irc.org/"; 81 - description = "Qt/KDE distributed IRC client suppporting a remote daemon"; 82 longDescription = '' 83 Quassel IRC is a cross-platform, distributed IRC client, 84 meaning that one (or multiple) client(s) can attach to
··· 78 79 meta = with lib; { 80 homepage = "https://quassel-irc.org/"; 81 + description = "Qt/KDE distributed IRC client supporting a remote daemon"; 82 longDescription = '' 83 Quassel IRC is a cross-platform, distributed IRC client, 84 meaning that one (or multiple) client(s) can attach to
+1 -1
pkgs/applications/science/electronics/digital/default.nix
··· 39 }; 40 41 # Fetching maven dependencies from "central" needs the network at build phase, 42 - # we do that in this extra derivation that explicitely specifies its 43 # outputHash to ensure determinism. 44 mavenDeps = stdenv.mkDerivation { 45 name = "${pname}-${version}-maven-deps";
··· 39 }; 40 41 # Fetching maven dependencies from "central" needs the network at build phase, 42 + # we do that in this extra derivation that explicitly specifies its 43 # outputHash to ensure determinism. 44 mavenDeps = stdenv.mkDerivation { 45 name = "${pname}-${version}-maven-deps";
+1 -1
pkgs/build-support/cc-wrapper/default.nix
··· 317 touch "$out/nix-support/cc-ldflags" 318 '' 319 320 - # Backwards compatability for packages expecting this file, e.g. with 321 # `$NIX_CC/nix-support/dynamic-linker`. 322 # 323 # TODO(@Ericson2314): Remove this after stable release and force
··· 317 touch "$out/nix-support/cc-ldflags" 318 '' 319 320 + # Backwards compatibility for packages expecting this file, e.g. with 321 # `$NIX_CC/nix-support/dynamic-linker`. 322 # 323 # TODO(@Ericson2314): Remove this after stable release and force
+1 -1
pkgs/data/fonts/rubik/default.nix
··· 95 spacing and other design details. 96 97 Cyrillic was initially designed by Philipp and Sebastian, and then revised and 98 - expanded by Cyreal Fonts Team (Alexei Vanyashin and Nikita Kanarev). Exising 99 glyphs were improved, and glyph set was expanded to GF Cyrillic Plus. 100 ''; 101 platforms = platforms.all;
··· 95 spacing and other design details. 96 97 Cyrillic was initially designed by Philipp and Sebastian, and then revised and 98 + expanded by Cyreal Fonts Team (Alexei Vanyashin and Nikita Kanarev). Existing 99 glyphs were improved, and glyph set was expanded to GF Cyrillic Plus. 100 ''; 101 platforms = platforms.all;
+1 -1
pkgs/development/compilers/cudatoolkit/flags.nix
··· 11 inherit (lib) attrsets lists strings trivial versions; 12 13 # Flags are determined based on your CUDA toolkit by default. You may benefit 14 - # from improved performance, reduced file size, or greater hardware suppport by 15 # passing a configuration based on your specific GPU environment. 16 # 17 # config.cudaCapabilities :: List Capability
··· 11 inherit (lib) attrsets lists strings trivial versions; 12 13 # Flags are determined based on your CUDA toolkit by default. You may benefit 14 + # from improved performance, reduced file size, or greater hardware support by 15 # passing a configuration based on your specific GPU environment. 16 # 17 # config.cudaCapabilities :: List Capability
+1 -1
pkgs/development/haskell-modules/configuration-common.nix
··· 2644 tomland = doJailbreak super.tomland; 2645 2646 # 2023-04-05: The last version to support libsoup-2.4, required for 2647 - # compatability with other gi- packages. 2648 # Take another look when gi-webkit2 updates as it may have become compatible with libsoup-3 2649 gi-soup = assert versions.major self.gi-webkit2.version == "4"; self.gi-soup_2_4_28; 2650
··· 2644 tomland = doJailbreak super.tomland; 2645 2646 # 2023-04-05: The last version to support libsoup-2.4, required for 2647 + # compatibility with other gi- packages. 2648 # Take another look when gi-webkit2 updates as it may have become compatible with libsoup-3 2649 gi-soup = assert versions.major self.gi-webkit2.version == "4"; self.gi-soup_2_4_28; 2650
+1 -1
pkgs/development/haskell-modules/generic-builder.nix
··· 15 # ghc.isGhcjs implies that we are using ghcjs, a project separate from GHC. 16 # (mere) stdenv.hostPlatform.isGhcjs means that we are using GHC's JavaScript 17 # backend. The latter is a normal cross compilation backend and needs little 18 - # special accomodation. 19 , dontStrip ? (ghc.isGhcjs or false || stdenv.hostPlatform.isGhcjs) 20 , version, revision ? null 21 , sha256 ? null
··· 15 # ghc.isGhcjs implies that we are using ghcjs, a project separate from GHC. 16 # (mere) stdenv.hostPlatform.isGhcjs means that we are using GHC's JavaScript 17 # backend. The latter is a normal cross compilation backend and needs little 18 + # special accommodation. 19 , dontStrip ? (ghc.isGhcjs or false || stdenv.hostPlatform.isGhcjs) 20 , version, revision ? null 21 , sha256 ? null
+1 -1
pkgs/development/libraries/libabw/default.nix
··· 9 sha256 = "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7"; 10 }; 11 12 - # Boost 1.59 compatability fix 13 # Attempt removing when updating 14 postPatch = '' 15 sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
··· 9 sha256 = "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7"; 10 }; 11 12 + # Boost 1.59 compatibility fix 13 # Attempt removing when updating 14 postPatch = '' 15 sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+1 -1
pkgs/development/libraries/libe-book/default.nix
··· 30 zlib 31 liblangtag 32 ]; 33 - # Boost 1.59 compatability fix 34 # Attempt removing when updating 35 postPatch = '' 36 sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
··· 30 zlib 31 liblangtag 32 ]; 33 + # Boost 1.59 compatibility fix 34 # Attempt removing when updating 35 postPatch = '' 36 sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
+1 -1
pkgs/development/libraries/speex/default.nix
··· 18 nativeBuildInputs = [ autoreconfHook pkg-config ]; 19 buildInputs = [ fftw speexdsp ]; 20 21 - # TODO: Remove this will help with immediate backward compatability 22 propagatedBuildInputs = [ speexdsp ]; 23 24 configureFlags = [
··· 18 nativeBuildInputs = [ autoreconfHook pkg-config ]; 19 buildInputs = [ fftw speexdsp ]; 20 21 + # TODO: Remove this will help with immediate backward compatibility 22 propagatedBuildInputs = [ speexdsp ]; 23 24 configureFlags = [
+1 -1
pkgs/development/python-modules/fs/default.nix
··· 30 31 buildInputs = [ glibcLocales ]; 32 33 - # strong cycle with paramaterized 34 doCheck = false; 35 nativeCheckInputs = [ pyftpdlib mock psutil pytestCheckHook ]; 36 propagatedBuildInputs = [ six appdirs pytz setuptools ]
··· 30 31 buildInputs = [ glibcLocales ]; 32 33 + # strong cycle with parameterized 34 doCheck = false; 35 nativeCheckInputs = [ pyftpdlib mock psutil pytestCheckHook ]; 36 propagatedBuildInputs = [ six appdirs pytz setuptools ]
+1 -1
pkgs/development/tools/azure-static-sites-client/default.nix
··· 67 # Stripping kills the binary 68 dontStrip = true; 69 70 - # Just make sure the binary executes sucessfully 71 doInstallCheck = true; 72 installCheckPhase = '' 73 runHook preInstallCheck
··· 67 # Stripping kills the binary 68 dontStrip = true; 69 70 + # Just make sure the binary executes successfully 71 doInstallCheck = true; 72 installCheckPhase = '' 73 runHook preInstallCheck
+1 -1
pkgs/servers/gpm/default.nix
··· 48 49 enableParallelBuilding = true; 50 51 - # Provide libgpm.so for compatability 52 postInstall = '' 53 ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so 54 '';
··· 48 49 enableParallelBuilding = true; 50 51 + # Provide libgpm.so for compatibility 52 postInstall = '' 53 ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so 54 '';
+1 -1
pkgs/shells/bash/bash-completion/default.nix
··· 23 strictDeps = true; 24 nativeBuildInputs = [ autoreconfHook ]; 25 26 - # tests are super flaky unfortunately, and regularily break. 27 # let's disable them for now. 28 doCheck = false; 29 nativeCheckInputs = [
··· 23 strictDeps = true; 24 nativeBuildInputs = [ autoreconfHook ]; 25 26 + # tests are super flaky unfortunately, and regularly break. 27 # let's disable them for now. 28 doCheck = false; 29 nativeCheckInputs = [
+1 -1
pkgs/stdenv/cross/default.nix
··· 9 crossSystem = localSystem; 10 crossOverlays = []; 11 12 - # Ignore custom stdenvs when cross compiling for compatability 13 config = builtins.removeAttrs config [ "replaceStdenv" ]; 14 }; 15
··· 9 crossSystem = localSystem; 10 crossOverlays = []; 11 12 + # Ignore custom stdenvs when cross compiling for compatibility 13 config = builtins.removeAttrs config [ "replaceStdenv" ]; 14 }; 15
+1 -1
pkgs/tools/misc/bc/default.nix
··· 27 doCheck = true; # not cross 28 29 # Hack to make sure we never to the relaxation `$PATH` and hooks support for 30 - # compatability. This will be replaced with something clearer in a future 31 # masss-rebuild. 32 strictDeps = true; 33
··· 27 doCheck = true; # not cross 28 29 # Hack to make sure we never to the relaxation `$PATH` and hooks support for 30 + # compatibility. This will be replaced with something clearer in a future 31 # masss-rebuild. 32 strictDeps = true; 33
+1 -1
pkgs/tools/networking/connman/connman/default.nix
··· 12 , libmnl 13 , gnutls 14 , readline 15 - # configureable options 16 , firewallType ? "iptables" # or "nftables" 17 , iptables ? null 18 , libnftnl ? null # for nftables
··· 12 , libmnl 13 , gnutls 14 , readline 15 + # configurable options 16 , firewallType ? "iptables" # or "nftables" 17 , iptables ? null 18 , libnftnl ? null # for nftables
+1 -1
pkgs/tools/security/plecost/default.nix
··· 13 }; 14 15 patches = [ 16 - # Fix compatability with aiohttp 3.x 17 # Merged - pending next release 18 (fetchpatch { 19 url = "https://github.com/iniqua/plecost/pull/34/commits/c09e7fab934f136f8fbc5f219592cf5fec151cf9.patch";
··· 13 }; 14 15 patches = [ 16 + # Fix compatibility with aiohttp 3.x 17 # Merged - pending next release 18 (fetchpatch { 19 url = "https://github.com/iniqua/plecost/pull/34/commits/c09e7fab934f136f8fbc5f219592cf5fec151cf9.patch";
+2 -2
pkgs/top-level/perl-packages.nix
··· 12516 hash = "sha256-PYHDzBtc/2nMqTYeLG443wNSJRrntB4v8/68hQ5GNWU="; 12517 }; 12518 meta = { 12519 - description = "Run a subprocess with input/ouput redirection"; 12520 license = with lib.licenses; [ artistic1 gpl1Plus bsd3 ]; 12521 }; 12522 }; ··· 23297 }; 23298 propagatedBuildInputs = [ TermVT102 ]; 23299 meta = { 23300 - description = "A Term::VT102 that grows automatically to accomodate whatever you print to it"; 23301 license = with lib.licenses; [ artistic1 gpl1Plus ]; 23302 }; 23303 };
··· 12516 hash = "sha256-PYHDzBtc/2nMqTYeLG443wNSJRrntB4v8/68hQ5GNWU="; 12517 }; 12518 meta = { 12519 + description = "Run a subprocess with input/output redirection"; 12520 license = with lib.licenses; [ artistic1 gpl1Plus bsd3 ]; 12521 }; 12522 }; ··· 23297 }; 23298 propagatedBuildInputs = [ TermVT102 ]; 23299 meta = { 23300 + description = "A Term::VT102 that grows automatically to accommodate whatever you print to it"; 23301 license = with lib.licenses; [ artistic1 gpl1Plus ]; 23302 }; 23303 };