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 /lib | |
| parent | 183f77f85f2aeeefff4b6fc1a92577542548c8a3 (diff) | |
lib.addPassthru: removed as scheduled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/customisation.nix | 6 | ||||
| -rw-r--r-- | lib/default.nix | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 823395f04d4a4..d942f54ee7989 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 77cfa712557c7..a25a23299b391 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 |