Remove composableDerivation, closes #18763 #44116
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Should we provide an explanation (with assert) if someone references it? |
|
The helper functions |
matthewbauer
approved these changes
Aug 2, 2018
Thanks for checking. Fixed. |
xeji
reviewed
Aug 4, 2018
lib/default.nix
Outdated
| @@ -123,14 +123,14 @@ let | |||
| traceShowValMarked showVal traceCall traceCall2 traceCall3 | |||
| traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; | |||
| inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs | |||
| defaultOverridableDelayableArgs composedArgsAndFun | |||
| composedArgsAndFun | |||
There was a problem hiding this comment.
composedArgsAndFun is removed from lib/deprecated.nix below.
lib/deprecated.nix
Outdated
| @@ -285,7 +217,7 @@ rec { | |||
| # }; | |||
| # will result in | |||
| # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; } | |||
| # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using | |||
| # is used by prepareDerivationArgs and can be used when composing using | |||
There was a problem hiding this comment.
prepareDerivationArgs is removed as well
| 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; |
There was a problem hiding this comment.
prepareDerivationArgs (L133) is removed
FRidh
force-pushed
the
composable
branch
2 times, most recently
from
4ff449c
to
11e91d2
Compare
|
Pushed an update. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)