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: 9289a39a6987
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: cccc7a93d28c
Choose a head ref
  • 5 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 17, 2019

  1. nixos/prometheus: filter out the _module attr in a central place

    We previously filtered out the `_module` attribute in a NixOS
    configuration by filtering it using the option's `apply` function.
    
    This meant that every option that had a submodule type needed to have
    this apply function. Adding this function is easy to forget thus this
    mechanism is error prone.
    
    We now recursively filter out the `_module` attributes at the place we
    construct the Prometheus configuration file. Since we now do the filtering
    centrally we don't have to do it per option making it less prone to errors.
    basvandijk committed Apr 17, 2019
    Copy the full SHA
    57e5b75 View commit details
    Browse the repository at this point in the history
  2. nixos/prometheus: set optional attributes to type types.nullOr

    This makes sure that when a user hasn't set a Prometheus option it
    won't show up in the prometheus.yml configuration file. This results
    in smaller and easier to understand configuration files.
    basvandijk committed Apr 17, 2019
    Copy the full SHA
    55ef5d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Copy the full SHA
    285fd3c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    cdd8268 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #59828 from basvandijk/prometheus-refactoring

    nixos/prometheus: refactored & added more missing options
    basvandijk committed Apr 18, 2019
    Copy the full SHA
    cccc7a9 View commit details
    Browse the repository at this point in the history