diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-31 12:00:36 +0100 |
| commit | 070290bda7972072a531c7e79a29bd005ebb84df (patch) | |
| tree | 572922a35ba554a97ff4771875f3a265fb8ce0e1 /lib/default.nix | |
| parent | ec1f78d1cb6ac86743ffb797bf88d4633b91e733 (diff) | |
| parent | 42575040fc64c1f5560c1cd1d1fdf0fd5e5d4b49 (diff) | |
| download | nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar.gz nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar.bz2 nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar.lz nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar.xz nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.tar.zst nixpkgs-070290bda7972072a531c7e79a29bd005ebb84df.zip | |
Merge master into staging-next
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index ee10ec1448b..025df167c60 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -125,14 +125,13 @@ let traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs - defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure innerModifySumArgs modifySumArgs innerClosePropagation closePropagation mapAttrsFlatten nvs setAttr setAttrMerge mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults - mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs - nixType imap overridableDelayableArgs; + mergeAttrsByFuncDefaultsClean mergeAttrBy + nixType imap; }); in lib |