about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2024-02-26 21:00:25 +0100
committerGitHub <noreply@github.com>2024-02-26 21:00:25 +0100
commitc1cebaeb16b06db581fe1c8664e1b35537109e0b (patch)
tree193ac6aa2dedb12f002034d9fa2159fecee6ab38 /lib
parent548a86b335d7ecd8b57ec617781f5e652ab0c38e (diff)
parente426a8f09740106e2944be4c583894edcb04830c (diff)
downloadnixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar.gz
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar.bz2
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar.lz
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar.xz
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.tar.zst
nixlib-c1cebaeb16b06db581fe1c8664e1b35537109e0b.zip
Merge pull request #291583 from SuperSandro2000/mergeAttrsList
lib: export attrsets.mergeAttrsList
Diffstat (limited to 'lib')
-rw-r--r--lib/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix
index a17307be6e07..668c29640f9f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -84,8 +84,8 @@ let
       mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive
       mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
-      recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin
-      getLib getDev getMan chooseDevOutputs zipWithNames zip
+      recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput
+      getBin getLib getDev getMan chooseDevOutputs zipWithNames zip
       recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets
       updateManyAttrsByPath;
     inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1