Reapply the rest of #14022#14225

Ericson2314 merged 3 commits into

NixOS:masterNixOS/nix:masterfrom

obsidiansystems:derivation-resolution-goal-2obsidiansystems/nix:derivation-resolution-goal-2Copy head branch name to clipboard