From 4413a877bb3e86eee0420e7f4beba0fcf02aa409 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 16:07:35 +0200 Subject: lib.map: Export from lib.lists.map --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index d5d47defb8e64..0e7b1d72337fe 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,7 +88,7 @@ let getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets mapCartesianProduct updateManyAttrsByPath; - inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 + 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 reverseList listDfs toposort sort sortOn naturalSort compareLists take -- cgit 1.4.1 From 56535c832ff422ac0b7f872a708258e2c2be105c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 17:49:20 +0200 Subject: lib.intersectAttrs: Export from builtins --- lib/attrsets.nix | 2 +- lib/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 83f8d0f34186e..c0ac6eeb41bcf 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 0e7b1d72337fe..eb4890b94229a 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 -- cgit 1.4.1 From 18382c2ec80a7eb656732dc2e1345ae76c2746b3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 17:51:16 +0200 Subject: lib.removeAttrs: Export from lib.attrsets.removeAttrs --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index eb4890b94229a..66f8c7da38dce 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 intersectAttrs; + mapCartesianProduct updateManyAttrsByPath intersectAttrs removeAttrs; 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 -- cgit 1.4.1 From 6c6244c37f6cdcb71305ae4871ccba3621c69a05 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 17:58:00 +0200 Subject: lib.match: Export from lib.strings.match --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index 66f8c7da38dce..5eaaba8867c25 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -105,7 +105,7 @@ let escapeRegex escapeURL escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast - getName getVersion + getName getVersion match cmakeOptionType cmakeBool cmakeFeature mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature -- cgit 1.4.1 From 89f6418908a01421577f25d4f3a4550c4b91ea5d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jun 2024 17:58:37 +0200 Subject: lib.split: Export from lib.strings.split --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index 5eaaba8867c25..1fb4ce7a61096 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -105,7 +105,7 @@ let escapeRegex escapeURL escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast - getName getVersion match + getName getVersion match split cmakeOptionType cmakeBool cmakeFeature mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature -- cgit 1.4.1