merge 56290 58927
thanks

Duplicate of <https://issues.guix.gnu.org/56290>