Unverified Commit 1bd4da18 authored by Matt Sturgeon's avatar Matt Sturgeon
Browse files

nixos/nixpkgs: fix `config` assertion text 

The assertion message should include the `nixpkgs.config` value, however
it currently includes the entire `nixpkgs.config` _option_.

This means the type, declarations, definitions, etc were all printed.
parent 5e5abe8f

nixos/modules/misc/nixpkgs.nix

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ in 
          `nixpkgs.config` options should be passed when creating the instance instead.



          Current value:

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

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

        '';

      }

    ];

nixos/modules/misc/nixpkgs/test.nix

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ let 
    nixpkgs.hostPlatform = "aarch64-linux";

    nixpkgs.buildPlatform = "aarch64-linux";

  };

  externalPkgsWithConfig = {

    nixpkgs.pkgs = pkgs;

    nixpkgs.config.allowUnfree = true;

  };

  ambiguous = {

    _file = "ambiguous.nix";

    nixpkgs.hostPlatform = "aarch64-linux";
@@ -108,6 +112,17 @@ lib.recurseIntoAttrs { 
          For a future proof system configuration, we recommend to remove

          the legacy definitions.

        ''];

    assert builtins.trace (lib.head (getErrors externalPkgsWithConfig))

      getErrors externalPkgsWithConfig ==

        [''

          Your system configures nixpkgs with an externally created instance.

          `nixpkgs.config` options should be passed when creating the instance instead.



          Current value:

          {

            allowUnfree = true;

          }

        ''];

    assert getErrors {

        nixpkgs.localSystem = pkgs.stdenv.hostPlatform;

        nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform;