Merge pull request #34245 from orivej/addPassthru

addPassthru: fix argument order
2018-01-25 10:37:36 +00:00
parent 7a2d35d9db ce1d740fa6
commit 3989b33e74
2 changed files with 4 additions and 3 deletions
@@ -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