diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-03-24 10:15:32 +0100 |
| commit | 96f063dd321abc80ecaa156226cfb7cf9540315a (patch) | |
| tree | 7a53ef61484fc7bfff6419b1fd635c67199f27d2 /nixpkgs/lib/default.nix | |
| parent | af58f08d3d524e7b008b73a8497ea710915ffaf1 (diff) | |
| parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) | |
Merge commit 'd96bd3394b734487d1c3bfbac0e8f17465e03afe'
Diffstat (limited to 'nixpkgs/lib/default.nix')
| -rw-r--r-- | nixpkgs/lib/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index d2fe018aa6a..a909cefd60f 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -24,6 +24,7 @@ let # packaging customisation = callLibs ./customisation.nix; maintainers = import ../maintainers/maintainer-list.nix; + teams = callLibs ../maintainers/team-list.nix; meta = callLibs ./meta.nix; sources = callLibs ./sources.nix; versions = callLibs ./versions.nix; @@ -55,6 +56,9 @@ let # back-compat aliases platforms = systems.doubles; + # linux kernel configuration + kernel = callLibs ./kernel.nix; + inherit (builtins) add addErrorContext attrNames concatLists deepSeq elem elemAt filter genericClosure genList getAttr hasAttr head isAttrs isBool isInt isList isString length @@ -73,7 +77,8 @@ let genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin - getLib getDev chooseDevOutputs zipWithNames zip; + getLib getDev chooseDevOutputs zipWithNames zip + recurseIntoAttrs dontRecurseIntoAttrs; inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists |