From cf482ce70a2bb899efa727a97dd72d8b3471df8b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 17:49:20 +0200 Subject: [PATCH] lib.intersectAttrs: Export from builtins (cherry picked from commit 56535c832ff422ac0b7f872a708258e2c2be105c) --- lib/attrsets.nix | 2 +- lib/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 83f8d0f34186..c0ac6eeb41bc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -11,7 +11,7 @@ let in rec { - inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr removeAttrs; + inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr removeAttrs intersectAttrs; /** diff --git a/lib/default.nix b/lib/default.nix index 0e7b1d72337f..eb4890b94229 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -87,7 +87,7 @@ let recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets - mapCartesianProduct updateManyAttrsByPath; + mapCartesianProduct updateManyAttrsByPath intersectAttrs; inherit (self.lists) singleton forEach map foldr fold foldl foldl' imap0 imap1 ifilter0 concatMap flatten remove findSingle findFirst any all count optional optionals toList range replicate partition zipListsWith zipLists