diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-26 12:05:40 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@enlambda.com> | 2018-12-30 12:33:45 +0000 |
| commit | c6e043d57c2cc69a1068a5e6e34b385942876d0e (patch) | |
| tree | 5235386c2d705ecc17c88c8179d5b4c051090038 /lib/default.nix | |
| parent | 30ff3e0f398ef1481f4a5f1b1bef730f0d71f712 (diff) | |
| download | nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar.gz nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar.bz2 nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar.lz nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar.xz nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.tar.zst nixpkgs-c6e043d57c2cc69a1068a5e6e34b385942876d0e.zip | |
Remove composableDerivation, closes #18763
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 e4e3e7d325a..916f6e05190 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 |