Unverified Commit 6d9dfef9 authored by Matt Sturgeon's avatar Matt Sturgeon
Browse files

nixos/nixpkgs: show definition files in `config` assertion

parent 1bd4da18

nixos/modules/misc/nixpkgs.nix

+3 −0
Original line number Diff line number Diff line
@@ -387,6 +387,9 @@ in 


          Current value:

          ${lib.generators.toPretty { multiline = true; } cfg.config}



          Defined in:

          ${lib.concatMapStringsSep "\n" (file: "  - ${file}") opt.config.files}

        '';

      }

    ];

nixos/modules/misc/nixpkgs/test.nix

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ let 
    nixpkgs.buildPlatform = "aarch64-linux";

  };

  externalPkgsWithConfig = {

    _file = "ext-pkgs-config.nix";

    nixpkgs.pkgs = pkgs;

    nixpkgs.config.allowUnfree = true;

  };
@@ -122,6 +123,9 @@ lib.recurseIntoAttrs { 
          {

            allowUnfree = true;

          }



          Defined in:

            - ext-pkgs-config.nix

        ''];

    assert getErrors {

        nixpkgs.localSystem = pkgs.stdenv.hostPlatform;