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: d1dba66e156d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 22b61e526341
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 13, 2021

  1. nixos/prometheus/exporters: fix eval if only openFirewall = true; i… 

    …s set

If `openFirewall = true`, but no `firewallFilter` is set, the evaluation
fails with the following error:

    The option `services.prometheus.exporters.node.firewallFilter` is defined both null and
    not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'
    and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'.

Originally introduced by me in #115185. The problem is that
`mkOptionDefault` has - as its name suggests - the same priority as the
default-value of the option `firewallFilter` and thus it conflicts if
this declaration and the actual default value are set which is the case
if `firewallFilter` isn't specified somewhere else.
    @Ma27
    Ma27 committed Mar 13, 2021
    Copy the full SHA
    22b61e5 View commit details
    Browse the repository at this point in the history