Hi Leo,

> Unfortunately, the second part of the patch ("hunk 2") does not apply to
> the latest Guix Git master branch:
you’re right. Looks like there is a weird space character between “;;”
and “Reported upstream”. Maybe email ate that? I’m attaching a `git
show` instead and also uploading the change to
https://github.com/PromyLOPh/guix (branch work-khal, commit
503169b39de09e3c3969bb2dc92464f054d79560).

Thanks for taking care of this,
Lars