Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 0508c93e836b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 99a29107333c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 23, 2020

  1. lib/modules.nix: Add file context to unmerged values in mergeDefinitions

    This helps with troubleshooting exceptions in config values, which were hard
    to track down for options with many definitions.
    The trace will look like:
    
        error: while evaluating the attribute 'config.foo' at undefined position:
        [...]
        while evaluating the option `foo':
        [...]
        while evaluating definitions from `/home/user/mymod.nix':
        while evaluating 'dischargeProperties' at /home/user/nixpkgs/lib/modules.nix:464:25, called from /home/user/nixpkgs/lib/modules.nix:392:137:
        while evaluating the attribute 'value' at /home/user/nixpkgs/lib/modules.nix:277:44:
        Value error!
    
    where the `/home/user/mymod.nix` module is
    
        { lib, ... }: {
          options.foo = lib.mkOption {
            type = lib.types.lines;
          };
          config.foo = builtins.throw "Value error!";
        }
    roberth committed Feb 23, 2020
    Copy the full SHA
    9c0ab2f View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Merge pull request #80919 from hercules-ci/modules-add-file-context

    lib/modules.nix: Add file context to unmerged values in mergeDefinitions
    roberth committed Mar 5, 2020
    Copy the full SHA
    99a2910 View commit details
    Browse the repository at this point in the history