From d09222e48f0a7124522a4d8c484d27a5125efef3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 26 Aug 2021 09:12:17 -0400 Subject: [PATCH] lib.compose{Many,}Extensions: Make compatible with nix flake check --- lib/fixed-points.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index f998bc74e1db..bf1567a22a66 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -72,10 +72,10 @@ rec { # into one where changes made in the first are available in the # 'super' of the second composeExtensions = - f: g: self: super: - let fApplied = f self super; - super' = super // fApplied; - in fApplied // g self super'; + f: g: final: prev: + let fApplied = f final prev; + prev' = prev // fApplied; + in fApplied // g final prev'; # Compose several extending functions of the type expected by 'extends' into # one where changes made in preceding functions are made available to @@ -84,7 +84,7 @@ rec { # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet # ^final ^prev ^overrides ^final ^prev ^overrides composeManyExtensions = - lib.foldr (x: y: composeExtensions x y) (self: super: {}); + lib.foldr (x: y: composeExtensions x y) (final: prev: {}); # Create an overridable, recursive attribute set. For example: #