Pushed to guix master as commit a15cee50cebddc665a16b455f44e22dcfb87d57f with slight changes to the commit message. Thanks!