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.

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

treewide: fix modules options types where the default is null #86236

Merged
merged 1 commit into from Aug 26, 2020

Conversation

ThibautMarty
Copy link
Member

They can be caught with nixos-option -r on an empty ({...}:{}) NixOS
configuration with warning like:

hardware.fancontrol.config = «error: The option value `hardware.fancontrol.config' in `/path/to/nixos/modules/services/hardware/fancontrol.nix' is not of type `strings concatenated with "\n"'.»;

They are actually the only kind of type error I get when using an empty configuration (not that bad!).

Obviously, most of the corrected options work well with null value, their implementation performs the check.
An indirect one is hardware.parallels.package which defaults to config.boot.kernelPackages.prl-tools. prl-tools is defined as null in all-packages.nix if kernel version is older than 4.15.

Motivation for this change

Correct options types, remove warnings.

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.

They can be caught with `nixos-option -r` on an empty ({...}:{}) NixOS
configuration.
@Lassulus
Copy link
Member

LGTM

@Lassulus Lassulus merged commit e453860 into NixOS:master Aug 26, 2020
@ThibautMarty ThibautMarty deleted the fix-nullOr-types branch November 24, 2020 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants