diff options
| author | Peter Simons <simons@cryp.to> | 2017-04-25 14:55:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 14:55:52 +0200 |
| commit | a502e327d383695546b09be47535d43b4829944d (patch) | |
| tree | 47f4fe4c17aca5292d197a8be56ec65e89eac8f5 /lib/trivial.nix | |
| parent | b5530755a53eb4e22384d05f5b2fb7a0a9b1e584 (diff) | |
| parent | a8fc60745f26a2b33650821414772ad047e48b62 (diff) | |
| download | nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar.gz nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar.bz2 nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar.lz nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar.xz nixpkgs-a502e327d383695546b09be47535d43b4829944d.tar.zst nixpkgs-a502e327d383695546b09be47535d43b4829944d.zip | |
Merge pull request #25201 from ebzzry/fix-typo
Fix typo in trivial.nix
Diffstat (limited to 'lib/trivial.nix')
| -rw-r--r-- | lib/trivial.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index 735aa55e0dc..cec28b1a22b 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; |