Merge remote-tracking branch 'NixOS/master' into lazy-trees

[bb010g]

figured i'd share this; think I got the merge correct? this merge includes the new error throwing code.

[bb010g]

This is way less relevant now, but from reviewing git diff bb010g/lazy-trees..edolstra/lazy-trees, there are a few places I think you missed with regards to errors (e.g. src/nix/flake.cc). I'd recommend comparing the behavior of this PR's src/libexpr/primops/patch.cc in particular; I think switching over to state.error gives better diagnostics. (General thing I noticed: Primops are currently called with noPos, so including that in traces will cause an unknown location to be reported. The primop call site is automatically added to any trace, so primops only need to worry about including other positions in their error traces.) src/libcmd/installables.cc line 428 caught my eye also; this line was specifically changed in 1123c42 in response to code review, but your merge reverted that. Anyways, the majority of our changes were the same, which is neat. Feel free to close this whenever you like.

[Artturin]

@bb010g Eelco has been keeping the branch very up to date recently so this can be closed

I checked that the merge revert has been fixed.

[bb010g]

@bb010g Eelco has been keeping the branch very up to date recently so this can be closed

I checked that the merge revert has been fixed.

I'll close this after checking the thoroughness of the current lazy-trees error handling (I remember Eelco's merge being a bit less through than mine when diffing); thanks for the reminder. That'll be in a separate PR anyhow.