gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.callPackage: preserve functionArgs (#443442)

Browse Source
This commit is contained in:
sternenseemann
2025-09-22 11:26:13 +00:00
committed by GitHub
parent 18c8672114 1a14dc6e44
commit 78e50a3885
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/haskell-modules/make-package-set.nix
View File

@@ -107,14 +107,17 @@ let
# is that nix has no way to "passthrough" args while preserving the reflection # is that nix has no way to "passthrough" args while preserving the reflection
# info that callPackage uses to determine the arguments). # info that callPackage uses to determine the arguments).
drv = if lib.isFunction fn then fn else import fn; drv = if lib.isFunction fn then fn else import fn;
auto = builtins.intersectAttrs (lib.functionArgs drv) scope; drvFunctionArgs = lib.functionArgs drv;
auto = builtins.intersectAttrs drvFunctionArgs scope;
# Converts a returned function to a functor attribute set if necessary # Converts a returned function to a functor attribute set if necessary
ensureAttrs = v: if builtins.isFunction v then { __functor = _: v; } else v; ensureAttrs = v: if builtins.isFunction v then { __functor = _: v; } else v;
# this wraps the `drv` function to add `scope` and `overrideScope` to the result. # this wraps the `drv` function to add `scope` and `overrideScope` to the result.
drvScope = # it's a functor, so that we can pass through `functionArgs`
allArgs: drvScope = {
__functor =
_: allArgs:
ensureAttrs (drv allArgs) ensureAttrs (drv allArgs)
// { // {
inherit scope; inherit scope;
@@ -130,6 +133,9 @@ let
# nothing. # nothing.
callPackageWithScope newScope drv manualArgs; callPackageWithScope newScope drv manualArgs;
}; };
# `drvScope` accepts the same arguments as `drv`
__functionArgs = drvFunctionArgs;
};
in in
lib.makeOverridable drvScope (auto // manualArgs); lib.makeOverridable drvScope (auto // manualArgs);