···652652 </listitem>
653653 <listitem>
654654 <para>
655655+ The <literal>nix.checkConfig</literal> option now fully
656656+ disables the config check. The new
657657+ <literal>nix.checkAllErrors</literal> option behaves like
658658+ <literal>nix.checkConfig</literal> previously did.
659659+ </para>
660660+ </listitem>
661661+ <listitem>
662662+ <para>
655663 <literal>generateOptparseApplicativeCompletions</literal> and
656664 <literal>generateOptparseApplicativeCompletion</literal> from
657665 <literal>haskell.lib.compose</literal> (and
+2
nixos/doc/manual/release-notes/rl-2211.section.md
···216216217217- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.
218218219219+- The `nix.checkConfig` option now fully disables the config check. The new `nix.checkAllErrors` option behaves like `nix.checkConfig` previously did.
220220+219221- `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose`
220222 (and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as
221223 provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.).
+12-5
nixos/modules/services/misc/nix-daemon.nix
···5959 ${mkKeyValuePairs cfg.settings}
6060 ${cfg.extraOptions}
6161 '';
6262- checkPhase =
6262+ checkPhase = lib.optionalString cfg.checkConfig (
6363 if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''
6464 echo "Ignoring validation for cross-compilation"
6565 ''
···7272 ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
7373 ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
7474 |& sed -e 's/^warning:/error:/' \
7575- | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')
7575+ | (! grep '${if cfg.checkAllErrors then "^error:" else "^error: unknown setting"}')
7676 set -o pipefail
7777- '';
7777+ '');
7878 };
79798080 legacyConfMappings = {
···395395 type = types.bool;
396396 default = true;
397397 description = lib.mdDoc ''
398398- If enabled (the default), checks for data type mismatches and that Nix
399399- can parse the generated nix.conf.
398398+ If enabled, checks that Nix can parse the generated nix.conf.
399399+ '';
400400+ };
401401+402402+ checkAllErrors = mkOption {
403403+ type = types.bool;
404404+ default = true;
405405+ description = lib.mdDoc ''
406406+ If enabled, checks the nix.conf parsing for any kind of error. When disabled, checks only for unknown settings.
400407 '';
401408 };
402409