diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 17:57:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-03 17:57:38 +0100 |
| commit | 7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7 (patch) | |
| tree | fada224a83281921d114006af814451f768e3743 | |
| parent | 183f77f85f2aeeefff4b6fc1a92577542548c8a3 (diff) | |
| download | nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar.gz nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar.bz2 nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar.lz nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar.xz nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.tar.zst nixpkgs-7b2cf5b12ee972888f987d9c0ca7a7c09a08c0d7.zip | |
lib.addPassthru: removed as scheduled
| -rw-r--r-- | lib/customisation.nix | 6 | ||||
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 823395f04d4..d942f54ee79 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -155,12 +155,6 @@ rec { outPath = assert condition; drv.outPath; }; - /* Add attributes to each output of a derivation without changing - the derivation itself. */ - 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 result to ensure that there are no thunks kept alive to prevent diff --git a/lib/default.nix b/lib/default.nix index 77cfa712557..a25a23299b3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -88,7 +88,7 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation addPassthru + callPackageWith callPackagesWith extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 9f80dcc2934..ca34d798a35 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -181,7 +181,7 @@ following incompatible changes:</para> </listitem> <listitem> <para> - <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> + <literal>lib.addPassthru drv passthru</literal> is removed. Use <literal>lib.extendDerivation true passthru drv</literal> instead. </para> </listitem> <listitem> |