feat(nix-patches): Reimplement pkgs.applyPatches
All checks were successful
Check meta / check_meta (pull_request) Successful in 14s
Check meta / check_dns (pull_request) Successful in 16s
Check workflows / check_workflows (pull_request) Successful in 24s
Build all the nodes / Jaccess01 (pull_request) Successful in 24s
Build all the nodes / Jaccess04 (pull_request) Successful in 26s
Run pre-commit on all files / pre-commit (pull_request) Successful in 35s
Build all the nodes / ap01 (pull_request) Successful in 42s
Build all the nodes / netcore01 (pull_request) Successful in 24s
Build all the nodes / bridge01 (pull_request) Successful in 53s
Build all the nodes / cof02 (pull_request) Successful in 58s
Build all the nodes / geo01 (pull_request) Successful in 59s
Build all the nodes / geo02 (pull_request) Successful in 1m0s
Build all the nodes / hypervisor01 (pull_request) Successful in 59s
Build all the nodes / hypervisor02 (pull_request) Successful in 51s
Build all the nodes / netcore02 (pull_request) Successful in 23s
Build all the nodes / build01 (pull_request) Successful in 1m5s
Build all the nodes / hypervisor03 (pull_request) Successful in 51s
Build all the nodes / compute01 (pull_request) Successful in 1m18s
Build all the nodes / iso (pull_request) Successful in 1m3s
Build all the nodes / lab-router01 (pull_request) Successful in 1m2s
Build the shell / build-shell (pull_request) Successful in 26s
Build all the nodes / tower01 (pull_request) Successful in 46s
Build all the nodes / web02 (pull_request) Successful in 47s
Build all the nodes / zulip01 (pull_request) Successful in 47s
Build all the nodes / rescue01 (pull_request) Successful in 1m11s
Build all the nodes / web03 (pull_request) Successful in 1m1s
Build all the nodes / vault01 (pull_request) Successful in 1m11s
Build all the nodes / web01 (pull_request) Successful in 1m12s
Build all the nodes / krz01 (pull_request) Successful in 1m59s
Build all the nodes / storage01 (pull_request) Successful in 1m58s
Run pre-commit on all files / pre-commit (push) Successful in 34s
Build all the nodes / Jaccess01 (push) Successful in 24s
Build all the nodes / Jaccess04 (push) Successful in 26s
Build all the nodes / ap01 (push) Successful in 46s
Build all the nodes / bridge01 (push) Successful in 57s
Build all the nodes / build01 (push) Successful in 1m0s
Build all the nodes / cof02 (push) Successful in 1m2s
Build all the nodes / netcore01 (push) Successful in 24s
Build all the nodes / hypervisor01 (push) Successful in 48s
Build all the nodes / hypervisor03 (push) Successful in 48s
Build all the nodes / netcore02 (push) Successful in 25s
Build all the nodes / hypervisor02 (push) Successful in 57s
Build all the nodes / geo02 (push) Successful in 1m0s
Build all the nodes / geo01 (push) Successful in 1m2s
Build all the nodes / iso (push) Successful in 59s
Build all the nodes / lab-router01 (push) Successful in 52s
Build all the nodes / compute01 (push) Successful in 1m28s
Build the shell / build-shell (push) Successful in 31s
Build all the nodes / tower01 (push) Successful in 49s
Build all the nodes / vault01 (push) Successful in 58s
Build all the nodes / web02 (push) Successful in 59s
Build all the nodes / zulip01 (push) Successful in 57s
Build all the nodes / web03 (push) Successful in 1m2s
Build all the nodes / krz01 (push) Successful in 1m42s
Build all the nodes / rescue01 (push) Successful in 1m18s
Build all the nodes / web01 (push) Successful in 1m12s
Build all the nodes / storage01 (push) Successful in 1m32s

It allows fetching patched-sources from cache and avoids idiotic
decisions made upstream
This commit is contained in:
Tom Hubrecht 2025-06-12 23:37:51 +02:00 committed by catvayor
parent 0455ca4175
commit b2cf1c2715

View file

@ -71,12 +71,31 @@ rec {
src, src,
name, name,
patches ? mkPatches name, patches ? mkPatches name,
}: prePatch ? null,
pkgs.applyPatches { postPatch ? null,
inherit patches src; ...
}@args:
if patches == [ ] && prePatch == null && postPatch == null then
src
else
pkgs.stdenvNoCC.mkDerivation (
args
// {
name = "${name}-patched";
name = "${name}-patched"; inherit patches prePatch postPatch;
};
preferLocalBuild = true;
allowSubstitutes = true;
phases = [
"unpackPhase"
"patchPhase"
"installPhase"
];
installPhase = "cp -R . $out";
}
);
applyPatches' = name: src: applyPatches { inherit name src; }; applyPatches' = name: src: applyPatches { inherit name src; };
}; };