diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | lib/trivial.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index bb8ca565dfd2..2fa7ca882e1a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -388,6 +388,7 @@ paholg = "Paho Lurie-Gregg <paho@paholg.com>"; pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>"; palo = "Ingolf Wanger <palipalo9@googlemail.com>"; + panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com"; paperdigits = "Mica Semrick <mica@silentumbrella.com>"; pashev = "Igor Pashev <pashev.igor@gmail.com>"; patternspandemic = "Brad Christensen <patternspandemic@live.com>"; diff --git a/lib/trivial.nix b/lib/trivial.nix index 735aa55e0dce..cec28b1a22b1 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -38,7 +38,7 @@ rec { /* Merge two attribute sets shallowly, right side trumps left Example: - mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; } + mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; } => { a = 1; b = 3; c = 4; } */ mergeAttrs = x: y: x // y; |