alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lib: change the order of arguments of addPassthru

Browse source
This commit is contained in:
Jan Malakhovski 2017-12-26 08:40:04 +00:00
parent fac3d49e48
commit 8606dd8556
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/customisation.nix
View file

@ -36,7 +36,7 @@ rec {
overrideDerivation = drv: f:
let
newDrv = derivation (drv.drvAttrs // (f drv));
in addPassthru newDrv (
in lib.flip addPassthru newDrv (
{ meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {};
}
@ -157,7 +157,7 @@ rec {
/* Add attributes to each output of a derivation without changing
the derivation itself. */
addPassthru = drv: passthru: extendDerivation true passthru drv;
addPassthru = extendDerivation true;
/* Strip a derivation of all non-essential attributes, returning
only those needed by hydra-eval-jobs. Also strictly evaluate the

8
pkgs/os-specific/linux/kernel/generic.nix
View file

@ -134,10 +134,12 @@ let
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
};
nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
addPassthru' = lib.addPassthru passthru;
crossDrv = lib.addPassthru kernel.crossDrv passthru;
nativeDrv = addPassthru' kernel.nativeDrv;
crossDrv = addPassthru' kernel.crossDrv;
in if kernel ? crossDrv
then nativeDrv // { inherit nativeDrv crossDrv; }
else lib.addPassthru kernel passthru
else addPassthru' kernel