remarshal_0_17: respect existing packageOverrides

Setting packageOverrides when overriding python will unset any previous
overrides. We have to manually compose the packageOverrides.
This commit is contained in:
Alexander Bantyev
2025-09-23 15:57:49 +04:00
parent 9e5afcd5d2
commit 31e9d058e5

View File

@@ -7,8 +7,6 @@
}: }:
let let
python = python3Packages.python.override {
self = python3Packages.python;
packageOverrides = self: super: { packageOverrides = self: super: {
tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec { tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
version = "0.12.5"; version = "0.12.5";
@@ -26,7 +24,10 @@ let
]; ];
}); });
}; };
}; python = python3Packages.python.override (oa: {
self = python3Packages.python;
packageOverrides = lib.composeExtensions (oa.packageOverrides or (_: _: { })) packageOverrides;
});
pythonPackages = python.pkgs; pythonPackages = python.pkgs;
in in
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {