summary refs log tree commit diff
path: root/lib/types.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2020-10-22 13:38:46 +0200
committerRobert Hensing <robert@roberthensing.nl>2020-10-22 13:46:47 +0200
commit5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739 (patch)
tree2eab967e5d90a65cec3c98836726cc802a6f9bbc /lib/types.nix
parent4d4682c2b6b1697236662495166b457abfb523cf (diff)
downloadnixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar.gz
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar.bz2
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar.lz
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar.xz
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.tar.zst
nixpkgs-5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739.zip
lib/types.nix: Use // instead of mergeAttrs
Diffstat (limited to 'lib/types.nix')
-rw-r--r--lib/types.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/types.nix b/lib/types.nix
index e9e45dc25c7..dd287734388 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -270,7 +270,7 @@ rec {
       name = "attrs";
       description = "attribute set";
       check = isAttrs;
-      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
+      merge = loc: foldl' (res: def: res // def.value) {};
       emptyValue = { value = {}; };
     };