github-actions[bot]
b6a580b9b3
Merge staging-next into staging
2021-10-27 00:02:06 +00:00
github-actions[bot]
23c6bab47e
Merge master into staging-next
2021-10-27 00:01:25 +00:00
eyjhb
75d64a336b
nixos/restic: rename s3CredentialsFile to environmentFile
...
This is done as the s3CredentialsFile specifies the environmentFile
for the systemd service, which can be used for more than just s3.
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-10-26 14:01:32 -07:00
Wei Tang
7c7cd951c5
nixos/step-ca: fix comment typo
2021-10-26 20:47:30 +02:00
github-actions[bot]
7455d89599
Merge staging-next into staging
2021-10-26 18:01:57 +00:00
github-actions[bot]
9a27efeb34
Merge master into staging-next
2021-10-26 18:01:19 +00:00
Sandro
89a27a2e6f
Merge pull request #119719 from greizgh/seafile
2021-10-26 19:07:00 +02:00
github-actions[bot]
9d11ed2864
Merge staging-next into staging
2021-10-26 12:02:02 +00:00
github-actions[bot]
6bb6e64046
Merge master into staging-next
2021-10-26 12:01:25 +00:00
Sandro
52abab8c90
Merge pull request #141918 from sternenseemann/remove-fluidsynth-1
2021-10-26 11:34:35 +02:00
Vladimír Čunát
1f89685452
Merge #142864 : nixos/gnome: fix an alias reference
2021-10-26 08:35:22 +02:00
github-actions[bot]
e5fe4acb71
Merge staging-next into staging
2021-10-26 06:01:35 +00:00
github-actions[bot]
7e0da80ec9
Merge master into staging-next
2021-10-26 06:01:02 +00:00
Cleeyv
37762975b5
nixos/doc: add jibri to release notes
2021-10-25 20:46:24 -04:00
Cleeyv
29f4cb4b0a
nixos/jibri: add nixos test
2021-10-25 20:46:24 -04:00
Cleeyv
917c5fae70
nixos/jibri: fix & docs for enable not via meet
2021-10-25 20:46:24 -04:00
Cleeyv
57bd54d28b
nixos/jibri: add finalize script option
2021-10-25 20:46:24 -04:00
Cleeyv
3473cff4b0
nixos/jibri: init at 8.0-93-g51fe7a2
...
This module was written by @puckipedia for nixcon-video-infra 2020.
Minor changes made by @cleeyv for compat with existing jibri package.
Co-authored-by: Puck Meerburg <puck@puck.moe>
2021-10-25 20:46:24 -04:00
Cleeyv
ff8ed90033
nixos/jitsi-meet: add jibri.enable
...
This option enables a jibri service on the same host that is running
jitsi-meet. It was written, along with the jibri module, by @puckipedia
for nixcon-video-infra 2020.
Co-authored-by: Puck Meerburg <puck@puck.moe>
2021-10-25 20:46:24 -04:00
github-actions[bot]
47ad670e14
Merge staging-next into staging
2021-10-26 00:02:18 +00:00
github-actions[bot]
0753497619
Merge master into staging-next
2021-10-26 00:01:40 +00:00
sternenseemann
45b312013e
fluidsynth_1: remove at 1.1.11
...
* FluidSynth 1.1.11 was kept around as a dependency of some packages
that hadn't yet adjusted to API breakages. All of these packages now
use FluidSynth 2.x, so fluidsynth_1 can be removed. It has been broken
ever since glib was updated to 2.70 and was affected by an unpatched
CVE.
* Refactor expression a bit, use pname instead of name.
* Add changelog entry in case someone was using this downstream
(accidentally?).
Fixes #141508 .
Fixes #124624 .
2021-10-26 01:56:17 +02:00
Timothy DeHerrera
4411b9b42c
Merge pull request #142869 from jonringer/fix-21.11-release-name-in-notes
...
nixos/release-notes: fix 21.11 release name
2021-10-25 15:40:44 -06:00
Martin Weinelt
a47e0a6554
Merge remote-tracking branch 'origin/master' into staging-next
2021-10-25 21:03:48 +02:00
Martin Weinelt
1c20719373
Merge pull request #139311 from NinjaTrappeur/nin-acme-fix-webroot
2021-10-25 20:27:29 +02:00
Jonathan Ringer
7d22ae1937
nixos/release-notes: fix 21.11 release name
2021-10-25 09:21:14 -07:00
Jonathan Ringer
569633e41c
nixos/gnome: remove alias reference to source-sans-pro
2021-10-25 08:28:23 -07:00
github-actions[bot]
a16b1b54b3
Merge staging-next into staging
2021-10-25 12:02:08 +00:00
github-actions[bot]
0336295c41
Merge master into staging-next
2021-10-25 12:01:31 +00:00
Florian Klink
81715a5da0
Merge pull request #142570 from flokli/add-missing-cryptsetup-targets
...
nixos/systemd: add remote-cryptsetup.target
2021-10-25 12:51:27 +02:00
Vladimír Čunát
b0d5803400
Merge #142786 : plasma5: fix eval without aliases
2021-10-25 11:50:44 +02:00
illustris
6688c52254
nixos/hadoop: add better test
...
The existing tests for HDFS and YARN only check if the services come up and expose their web interfaces.
The new combined hadoop test will also test whether the services and roles work together as intended.
It spin up an HDFS+YARN cluster and submit a demo YARN application that uses the hadoop cluster for
storageand yarn cluster for compute.
2021-10-25 16:30:19 +09:00
illustris
91bb2b7016
nixos/hadoop: fix yarn, add more service configuration options
2021-10-25 16:30:19 +09:00
github-actions[bot]
71de656d73
Merge staging-next into staging
2021-10-25 06:02:04 +00:00
github-actions[bot]
0386c26190
Merge master into staging-next
2021-10-25 06:01:29 +00:00
Izorkin
a7c6546991
nixos/peertube:add release notes
2021-10-25 13:12:30 +09:00
Izorkin
cba4aeee5d
nixos/tests: add peertube test
2021-10-25 13:12:30 +09:00
Izorkin
4c092350ed
nixos/peertube: init service
...
Co-authored-by: Moritz Hedtke <Moritz.Hedtke@t-online.de>
Co-authored-by: Steven Roose <steven@stevenroose.org>
Co-authored-by: Matthias Beyer <mail@beyermatthias.de>
Co-authored-by: Ismaël Bouya <ismael.bouya@normalesup.org>
2021-10-25 13:12:30 +09:00
github-actions[bot]
b838d814f0
Merge staging-next into staging
2021-10-25 00:02:07 +00:00
github-actions[bot]
24cfffaa7a
Merge master into staging-next
2021-10-25 00:01:32 +00:00
ajs124
76a77c0bfb
plasma5: fix evaluation with aliases disabled and thunderbolt enabled
2021-10-24 23:10:52 +02:00
ajs124
a26bf2cabc
Merge pull request #142675 from helsinki-systems/fix/test-runner-thread-cleanup
...
nixos/test-runner: Fix thread cleanup
2021-10-24 20:12:41 +02:00
github-actions[bot]
260ccf163b
Merge staging-next into staging
2021-10-24 18:01:32 +00:00
github-actions[bot]
ceea0e5f2a
Merge master into staging-next
2021-10-24 18:00:57 +00:00
Bruno Bigras
69b01e3a22
Merge pull request #141408 from bbigras/openresty-lua
...
nixos/nginx: disable MemoryDenyWriteExecute for pkgs.openresty
2021-10-24 17:39:27 +00:00
Sandro
062469fd09
Merge pull request #140309 from OPNA2608/init/gkraken/21.11
2021-10-24 18:28:57 +02:00
Janne Heß
1ed5606d8a
nixos/test-runner: Fix thread cleanup
2021-10-24 15:11:46 +02:00
github-actions[bot]
e3eaad4c0b
Merge staging-next into staging
2021-10-24 12:02:01 +00:00
github-actions[bot]
e84dc8ac6b
Merge master into staging-next
2021-10-24 12:01:27 +00:00
Sandro
0920efc96d
Merge pull request #142703 from schmittlauch/cawbird-rl-21-11
...
release-notes: Include note on Cawbird API key change
2021-10-24 12:18:21 +02:00