@@ -72,10 +72,10 @@ rec {
7272 # into one where changes made in the first are available in the
7373 # 'super' of the second
7474 composeExtensions =
75− f: g: self: super:
76− let fApplied = f self super;
77− super' = super // fApplied;
78− in fApplied // g self super';
75+ f: g: final: prev:
76+ let fApplied = f final prev;
77+ prev' = prev // fApplied;
78+ in fApplied // g final prev';
7979
8080 # Compose several extending functions of the type expected by 'extends' into
8181 # one where changes made in preceding functions are made available to
@@ -84,7 +84,7 @@ rec {
8484 # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet
8585 # ^final ^prev ^overrides ^final ^prev ^overrides
8686 composeManyExtensions =
87− lib.foldr (x: y: composeExtensions x y) (self: super: {});
87+ lib.foldr (x: y: composeExtensions x y) (final: prev: {});
8888
8989 # Create an overridable, recursive attribute set. For example:
9090 #