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/cgit.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/cgit.scm')
| -rw-r--r-- | gnu/services/cgit.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm index 94ca9e281a..bfc89a40a4 100644 --- a/gnu/services/cgit.scm +++ b/gnu/services/cgit.scm @@ -319,7 +319,7 @@ after this option will inherit the current section name.") ;; <repository-cgit-configuration>, <nginx-server-configuration>, <package>. (define-configuration cgit-configuration (package - (package cgit) + (file-like cgit) "The CGIT package.") (nginx (nginx-server-configuration-list (list %cgit-configuration-nginx)) @@ -673,7 +673,7 @@ for cgit to allow access to that repository.") (define-configuration opaque-cgit-configuration (cgit - (package cgit) + (file-like cgit) "The cgit package.") (cgitrc (string (configuration-missing-field 'opaque-cgit-configuration 'cgitrc)) |