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

remarshal_0_17: respect existing packageOverrides

Browse Source 
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
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/by-name/re/remarshal_0_17/package.nix
View File

@@ -7,26 +7,27 @@
}: }:
let let
python = python3Packages.python.override { packageOverrides = self: super: {
self = python3Packages.python; tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec {
packageOverrides = self: super: { version = "0.12.5";
tomlkit = super.tomlkit.overridePythonAttrs (oldAttrs: rec { src = fetchPypi {
version = "0.12.5"; pname = "tomlkit";
src = fetchPypi { inherit version;
pname = "tomlkit"; hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw=";
inherit version; };
hash = "sha256-7vNPujmDTU1rc8m6fz5NHEF6Tlb4mn6W4JDdDSS4+zw="; patches = [
}; (fetchpatch {
patches = [ url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch";
(fetchpatch { hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc=";
url = "https://github.com/python-poetry/tomlkit/commit/05d9be1c2b2a95a4eb3a53d999f1483dd7abae5a.patch"; excludes = [ ".github/workflows/tests.yml" ];
hash = "sha256-9pLGxcGHs+XoKrqlh7Q0dyc07XrK7J6u2T7Kvfd0ICc="; })
excludes = [ ".github/workflows/tests.yml" ]; ];
}) });
];
});
};
}; };
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 {