add .overrideDerivation and .overrideAttrs to packages created with callPackages #18455
Conversation
lib/customisation.nix
Outdated
| mkAttrOverridable = name: pkg: pkg // { | ||
| override = newArgs: mkAttrOverridable name (f (finalArgs // newArgs)).${name}; | ||
| }; | ||
| mkAttrOverridable = name: pkg: makeOverridableGeneric (x: x."${name}") f finalArgs; |
There was a problem hiding this comment.
It looks like postProcess is always applied directly to the output of f in makeOverrideableGeneric, so why not just pass the composition of f and x: x."${name}" to makeOverrideable here?
There was a problem hiding this comment.
my bad, how had I missed that?..
lib/customisation.nix
Outdated
| mkAttrOverridable = name: pkg: pkg // { | ||
| override = newArgs: mkAttrOverridable name (f (finalArgs // newArgs)).${name}; | ||
| }; | ||
| mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) finalArgs; |
There was a problem hiding this comment.
Can you also rename finalArgs to origArgs? I think that is less confusing.
There was a problem hiding this comment.
No problem. There are args, auto, autoArgs, finalArgs and newArgs in one function! So in any case it is better to follow binding declarations than relying on mnemonics.
|
ping @edolstra |
|
Instead we should rather add |
|
@domenkozar, this doesn't add |
danbst
force-pushed
the
override
branch
2 times, most recently
from
2a1af91
to
bc532ff
Compare
…callPackages`/`callPackagesWith` nix/nixUnstable, tomcatN and postgresqlNN use `callPackages` pattern, they have .override attribute, but lack .overrideDerivation and recent .overrideAttrs. Packages created with `callPackage` have all of those. Because .overrideDerivation function is used in public, without this we can break code when refactoring callPackage -> callPackages.
danbst
changed the title
|
Rebased to master, added motivation for a change to commit message, changed topic name, tested using |
Motivation for this change
After I've change tomcat to
callPackagesin #18419 , I've noticed thatpkgs.tomcat8.overrideDerivationattribute is lost. This PR is my (and @aneeshusa) vision on how to restore it.Things done
[x] tested override and overrideDerivation for tomcat
[ ] tested everything else