lib.extendMkDerivation: add argument excludeFunctionArgNames

lib/customisation.nix

@@ -770,6 +770,10 @@ rec {
       : Argument names not to pass from the input fixed-point arguments to `constructDrv`.
         It doesn't apply to the updating arguments returned by `extendDrvArgs`.
 
+      `excludeFunctionArgNames` (default to `[ ]`)
+      : `__functionArgs` attribute names to remove from the result build helper.
+        `excludeFunctionArgNames` is useful for argument deprecation while avoiding ellipses.
+
       `extendDrvArgs` (required)
       : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
 
@@ -787,6 +791,7 @@ rec {
       {
         constructDrv :: ((FixedPointArgs | AttrSet) -> a)
         excludeDrvArgNames :: [ String ],
+        excludeFunctionArgNames :: [ String ]
         extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet)
         inheritFunctionArgs :: Bool,
         transformDrv :: a -> a,
@@ -847,6 +852,7 @@ rec {
     {
       constructDrv,
       excludeDrvArgNames ? [ ],
+      excludeFunctionArgNames ? [ ],
       extendDrvArgs,
       inheritFunctionArgs ? true,
       transformDrv ? id,
@@ -861,10 +867,12 @@ rec {
       )
       # Add __functionArgs
       (
+        removeAttrs (
           # Inherit the __functionArgs from the base build helper
           optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
           # Recover the __functionArgs from the derived build helper
           // functionArgs (extendDrvArgs { })
+        ) excludeFunctionArgNames
       )
     // {
       inherit