diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/services/messaging.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/services/messaging.scm')
| -rw-r--r-- | gnu/services/messaging.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 0fcb7faf89..6ed55453db 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -333,7 +333,7 @@ can create such a file with: (define-all-configurations prosody-configuration (prosody - (package prosody) + (file-like prosody) "The Prosody package." global) @@ -623,7 +623,7 @@ See also @url{https://prosody.im/doc/modules/mod_muc}." (define-configuration opaque-prosody-configuration (prosody - (package prosody) + (file-like prosody) "The prosody package.") (prosody.cfg.lua |