Merge pull request #210761 from abathur/resholve_track_missed_fix
resholve: track missed upstream Nix fix
authored by Thiago Kenji Okada and committed by GitHub 3 years ago d00a5dad a6975fd0