Hi Marius,

> Can you build with '--keep-failed', and then run:
> 
>   diffoscope /gnu/store/k22jfy6asbwsxbmmajgghcnnrz6dgaqi-carla-
> 2.0.0{,-check}
> 
> and send the output?
> 
> The updated patch LGTM, but does not apply any more.  Can you rebase
> it
> on top of current 'master'?

Attaching the diffoscope output and updated patch. The output from
diffoscope was 8.5MB so I compressed it. Note that the hash has
changed.