Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/modules: Fix nonexistant option error #95718

Merged
merged 1 commit into from Aug 18, 2020
Merged

lib/modules: Fix nonexistant option error #95718

merged 1 commit into from Aug 18, 2020

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Aug 17, 2020 •
edited

Motivation for this change

The refactoring in fd75dc8 (#82743)
introduced a mistake in the error message that doesn't show the full
context anymore. E.g. with this module:

options.foo.bar = lib.mkOption {
  type = lib.types.submodule {
    baz = 10;
  };
  default = {};
};

You'd get the error

The option baz defined in /home/infinisil/src/nixpkgs/config.nix does not exist.

instead of the previous

The option foo.bar.baz defined in /home/infinisil/src/nixpkgs/config.nix does not exist.

This commit undoes this regression

Ping @roberth @Ma27

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@infinisil
lib/modules: Fix nonexistant option error
d5700d6 
The refactoring in NixOS@fd75dc8
introduced a mistake in the error message that doesn't show the full
context anymore. E.g. with this module:

  options.foo.bar = lib.mkOption {
    type = lib.types.submodule {
      baz = 10;
    };
    default = {};
  };

You'd get the error

  The option `baz' defined in `/home/infinisil/src/nixpkgs/config.nix' does not exist.

instead of the previous

  The option `foo.bar.baz' defined in `/home/infinisil/src/nixpkgs/config.nix' does not exist.

This commit undoes this regression
@infinisil infinisil mentioned this pull request Aug 17, 2020
Merged
10 tasks
@infinisil infinisil added the 6.topic: module system About NixOS module system internals label Aug 18, 2020
@Ma27 Ma27 merged commit 30842d0 into NixOS:master Aug 18, 2020
@infinisil infinisil deleted the fixup-nonexistant-option-error branch August 18, 2020 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: module system About NixOS module system internals 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@infinisil @Ma27