pyrox.dev / nixpkgs
lol
fork atom

nixos/manual: apply `cfg.warningsAreErrors` to nix eval as well

This change makes `baseOptionsJSON` (`lazy-option.json`) take
our existing `documentation.nixos.options.warningsAreErrors` option into
account to then set the `NIX_ABORT_ON_WARN` environment variable within
its build sandbox accordingly.

Given `documentation.nixos.options.warningsAreErrors` default to true,
our nixpkgs CI check that builds the NixOS manual for each PR, will now
fail when something raises a warning, e.g. as part of the `lib.mdDoc`
deprecation.

This should prevent new PRs with lib.mdDoc from getting merged.

Previously, the manual would build successfully, even if an eval warning
was raised.

emilylange 2872e103 41992852

options
unified split
Changed files
+1
nixos
modules
misc
documentation.nix
+1
nixos/modules/misc/documentation.nix 
···

       
101

       
 

       
          libPath = filter (pkgs.path + "/lib");


     

       
102

       
 

       
          pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");


     

       
103

       
 

       
          nixosPath = filter (pkgs.path + "/nixos");


     

       

       

       
     

       
104

       
 

       
          modules =


     

       
105

       
 

       
            "[ "


     

       
106

       
 

       
            + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy


     
···

       
101

       
 

       
          libPath = filter (pkgs.path + "/lib");


     

       
102

       
 

       
          pkgsLibPath = filter (pkgs.path + "/pkgs/pkgs-lib");


     

       
103

       
 

       
          nixosPath = filter (pkgs.path + "/nixos");


     

       
104

       
+

       
          NIX_ABORT_ON_WARN = warningsAreErrors;


     

       
105

       
 

       
          modules =


     

       
106

       
 

       
            "[ "


     

       
107

       
 

       
            + concatMapStringsSep " " (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy