diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-03 22:33:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-03 22:34:49 +0200 |
| commit | ee86a325dd067df0da827c2044e8f6e39ffbfed6 (patch) | |
| tree | e0a4c1946e6101aa41c02c65387b9941fb9b1f48 /nixos/modules/module-list.nix | |
| parent | 2812b5ce392370ca671a1f371904a12aa3c6db13 (diff) | |
| parent | c4724fb7bcc83a778632ce096e37b7dcdd3b034b (diff) | |
| download | nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.gz nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.bz2 nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.lz nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.xz nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.tar.zst nixlib-ee86a325dd067df0da827c2044e8f6e39ffbfed6.zip | |
Merge branch 'staging-next' into staging
Conflicts (simple): nixos/doc/manual/release-notes/rl-1909.xml
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9152121d43d2..5042470802f0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -95,6 +95,7 @@ ./programs/ccache.nix ./programs/cdemu.nix ./programs/chromium.nix + ./programs/clickshare.nix ./programs/command-not-found/command-not-found.nix ./programs/criu.nix ./programs/dconf.nix @@ -762,6 +763,7 @@ ./services/web-apps/frab.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix + ./services/web-apps/limesurvey.nix ./services/web-apps/mattermost.nix ./services/web-apps/miniflux.nix ./services/web-apps/nextcloud.nix |