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: c06b0edde22c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f3893d8b534d
Choose a head ref
  • 6 commits
  • 10 files changed
  • 2 contributors

Commits on Sep 15, 2020

  1. nixos/doc: Soft deprecate types.attrs

    @infinisil
    infinisil committed Sep 15, 2020
    Copy the full SHA
    b381016 View commit details
    Browse the repository at this point in the history

  2. lib/options: Fix mergeEqualOption for singular functions 

    Previously it would error out for a single function definition
    @infinisil
    infinisil committed Sep 15, 2020
    Copy the full SHA
    6e7bc2c View commit details
    Browse the repository at this point in the history

  3. lib/types: Introduce types.anything 

    This new type has unsurprising merge behavior: Only attribute sets are
merged together (recursively), and only if they don't conflict.

This is in contrast to the existing types:
- types.attrs is problematic because later definitions completely
  override attributes of earlier definitions, and it doesn't support
  mkIf and co.
- types.unspecified is very similar to types.attrs, but it has smart
  merging behavior that often doesn't make sense, and it doesn't support
  all types
    @infinisil
    infinisil committed Sep 15, 2020
    Copy the full SHA
    67551f4 View commit details
    Browse the repository at this point in the history

  4. lib/tests: Add tests for types.anything

    @infinisil
    infinisil committed Sep 15, 2020
    Copy the full SHA
    6a7d250 View commit details
    Browse the repository at this point in the history

  5. nixos/doc: Add docs for types.anything

    @infinisil
    infinisil committed Sep 15, 2020
    Copy the full SHA
    3106993 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2020

  1. Merge pull request #97119 from Infinisil/types.anything 

    Introduce `types.anything`
    @roberth
    roberth committed Sep 21, 2020
    Copy the full SHA
    f3893d8 View commit details
    Browse the repository at this point in the history