diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2024-06-20 19:56:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 19:56:58 +0200 |
| commit | bdc03c2dd893d173e370aa5a9fac29d168a3911a (patch) | |
| tree | 5cee620cf169feba3f3c024c270d22fdb93b7095 /lib | |
| parent | 1bb6b44718a1586e9b160ccbb6283eb7e02370ea (diff) | |
| parent | 89f6418908a01421577f25d4f3a4550c4b91ea5d (diff) | |
Merge pull request #321283 from tweag/lib-builtins
`lib`: Re-export expected builtins
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/attrsets.nix | 2 | ||||
| -rw-r--r-- | lib/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
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 d5d47defb8e64..1fb4ce7a61096 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -87,8 +87,8 @@ let recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets - mapCartesianProduct updateManyAttrsByPath; - inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 + 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 reverseList listDfs toposort sort sortOn naturalSort compareLists take @@ -105,7 +105,7 @@ let escapeRegex escapeURL escapeXML replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast - getName getVersion + getName getVersion match split cmakeOptionType cmakeBool cmakeFeature mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature |