diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-25 10:37:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-25 10:37:36 +0000 |
| commit | 3989b33e74227be641136d80f91f294e0364e4b0 (patch) | |
| tree | 8edd864e94b122fe30bdcd1e68a318766a9afca8 | |
| parent | 7a2d35d9db9dcbeeaab9015ae9ce013644321bbe (diff) | |
| parent | ce1d740fa6621818b9d9660aeef443b0758ae486 (diff) | |
| download | nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar.gz nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar.bz2 nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar.lz nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar.xz nixlib-3989b33e74227be641136d80f91f294e0364e4b0.tar.zst nixlib-3989b33e74227be641136d80f91f294e0364e4b0.zip | |
Merge pull request #34245 from orivej/addPassthru
addPassthru: fix argument order
| -rw-r--r-- | lib/customisation.nix | 5 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index fb78335ea1c2..3988f4e9b690 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -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 diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 1a146473e23c..beda33f601b3 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -133,7 +133,7 @@ following incompatible changes:</para> </listitem> <listitem> <para> - <literal>lib.addPassthru</literal> is removed. Use <literal>lib.extendDerivation true</literal> instead. <emphasis role="strong">TODO: actually remove it before branching 18.03 off.</emphasis> + <literal>lib.addPassthru drv passthru</literal> is removed. Use <literal>lib.extendDerivation true passthru drv</literal> instead. <emphasis role="strong">TODO: actually remove it before branching 18.03 off.</emphasis> </para> </listitem> <listitem> |