addPassthru: fix argument order

addPassthru became unused in #33057, but its signature was changed at the same
time.  This commit restores the original signature and updates the warning and
the changelog.
This commit is contained in:
Orivej Desh
2018-01-24 23:06:12 +00:00
parent 0e7a5207ec
commit ce1d740fa6
2 changed files with 4 additions and 3 deletions

View File

@@ -157,8 +157,9 @@ rec {
/* Add attributes to each output of a derivation without changing
the derivation itself. */
addPassthru = lib.warn "`addPassthru` is deprecated, replace with `extendDerivation true`"
(extendDerivation true);
addPassthru =
lib.warn "`addPassthru drv passthru` is deprecated, replace with `extendDerivation true passthru drv`"
(drv: passthru: extendDerivation true passthru drv);
/* Strip a derivation of all non-essential attributes, returning
only those needed by hydra-eval-jobs. Also strictly evaluate the