Merge remote-tracking branch 'origin/master' into staging.

With resolved conflicts in:
	gnu/packages/ibus.scm
	gnu/packages/image.scm
	gnu/packages/lisp.scm
	gnu/packages/virtualization.scm
This commit is contained in:
Maxim Cournoyer 2023-03-23 21:45:21 -04:00
commit 839bb4616f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
599 changed files with 326965 additions and 238699 deletions

View file

@ -428,5 +428,5 @@ individual low-level driver modules.")
(description "Xoscope is a digital oscilloscope that can acquire signals
from ALSA, ESD, and COMEDI sources. This package currently does not include
support for ESD sources.")
(home-page "http://xoscope.sourceforge.net/")
(home-page "https://xoscope.sourceforge.net/")
(license license:gpl2+)))