···

       
652
       
652
       
 
       
      </listitem>

     

       
653
       
653
       
 
       
      <listitem>

     

       
654
       
654
       
 
       
        <para>

     

       
655
       
655
       
+
       
          The <literal>nix.checkConfig</literal> option now fully

     

       
656
       
656
       
+
       
          disables the config check. The new

     

       
657
       
657
       
+
       
          <literal>nix.checkAllErrors</literal> option behaves like

     

       
658
       
658
       
+
       
          <literal>nix.checkConfig</literal> previously did.

     

       
659
       
659
       
+
       
        </para>

     

       
660
       
660
       
+
       
      </listitem>

     

       
661
       
661
       
+
       
      <listitem>

     

       
662
       
662
       
+
       
        <para>

     

       
655
       
663
       
 
       
          <literal>generateOptparseApplicativeCompletions</literal> and

     

       
656
       
664
       
 
       
          <literal>generateOptparseApplicativeCompletion</literal> from

     

       
657
       
665
       
 
       
          <literal>haskell.lib.compose</literal> (and

     

···

       
216
       
216
       
 
       


     

       
217
       
217
       
 
       
- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.

     

       
218
       
218
       
 
       


     

       
219
       
219
       
+
       
- The `nix.checkConfig` option now fully disables the config check. The new `nix.checkAllErrors` option behaves like `nix.checkConfig`  previously did.

     

       
220
       
220
       
+
       


     

       
219
       
221
       
 
       
- `generateOptparseApplicativeCompletions` and `generateOptparseApplicativeCompletion` from `haskell.lib.compose`

     

       
220
       
222
       
 
       
  (and `haskell.lib`) have been deprecated in favor of `generateOptparseApplicativeCompletions` (plural!) as

     

       
221
       
223
       
 
       
  provided by the haskell package sets (so `haskellPackages.generateOptparseApplicativeCompletions` etc.).

     

···

       
59
       
59
       
 
       
        ${mkKeyValuePairs cfg.settings}

     

       
60
       
60
       
 
       
        ${cfg.extraOptions}

     

       
61
       
61
       
 
       
      '';

     

       
62
       
62
       
-
       
      checkPhase =

     

       
62
       
62
       
+
       
      checkPhase = lib.optionalString cfg.checkConfig (

     

       
63
       
63
       
 
       
        if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''

     

       
64
       
64
       
 
       
          echo "Ignoring validation for cross-compilation"

     

       
65
       
65
       
 
       
        ''

     
···

       
72
       
72
       
 
       
            ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \

     

       
73
       
73
       
 
       
              ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \

     

       
74
       
74
       
 
       
            |& sed -e 's/^warning:/error:/' \

     

       
75
       
75
       
-
       
            | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')

     

       
75
       
75
       
+
       
            | (! grep '${if cfg.checkAllErrors then "^error:" else "^error: unknown setting"}')

     

       
76
       
76
       
 
       
          set -o pipefail

     

       
77
       
77
       
-
       
        '';

     

       
77
       
77
       
+
       
        '');

     

       
78
       
78
       
 
       
    };

     

       
79
       
79
       
 
       


     

       
80
       
80
       
 
       
  legacyConfMappings = {

     
···

       
395
       
395
       
 
       
        type = types.bool;

     

       
396
       
396
       
 
       
        default = true;

     

       
397
       
397
       
 
       
        description = lib.mdDoc ''

     

       
398
       
398
       
-
       
          If enabled (the default), checks for data type mismatches and that Nix

     

       
399
       
399
       
-
       
          can parse the generated nix.conf.

     

       
398
       
398
       
+
       
          If enabled, checks that Nix can parse the generated nix.conf.

     

       
399
       
399
       
+
       
        '';

     

       
400
       
400
       
+
       
      };

     

       
401
       
401
       
+
       


     

       
402
       
402
       
+
       
      checkAllErrors = mkOption {

     

       
403
       
403
       
+
       
        type = types.bool;

     

       
404
       
404
       
+
       
        default = true;

     

       
405
       
405
       
+
       
        description = lib.mdDoc ''

     

       
406
       
406
       
+
       
          If enabled, checks the nix.conf parsing for any kind of error. When disabled, checks only for unknown settings.

     

       
400
       
407
       
 
       
        '';

     

       
401
       
408
       
 
       
      };

     

       
402
       
409