Merge branch 'master' into staging

diff --cc gnu/packages/crates-io.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/lisp-xyz.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge