Commit Graph

13347 Commits

Author SHA1 Message Date
bb2020
8bdcffc4fe nixos/mbpfan: minor changes 2022-05-10 15:40:17 +03:00
github-actions[bot]
27575e98ee
Merge staging-next into staging 2022-05-09 12:08:45 +00:00
Janne Heß
e6fb1e63d1
Merge pull request #171650 from helsinki-systems/feat/config-systemd-package
treewide: pkgs.systemd -> config.systemd.package
2022-05-09 10:23:04 +02:00
github-actions[bot]
31938a3f5c
Merge staging-next into staging 2022-05-09 00:03:28 +00:00
github-actions[bot]
f39e774f11
Merge master into staging-next 2022-05-09 00:02:27 +00:00
Sandro
8803756fd3
Merge pull request #172072 from ivan/tinc-unbreak
nixos/tinc: unbreak the service
2022-05-09 01:27:12 +02:00
Sandro
b196dea22d
Merge pull request #172080 from wentasah/usbrelay-1.0
usbrelay: 0.9 -> 1.0
2022-05-09 01:02:08 +02:00
Michal Sojka
26ec7081d6 nixos/usbrelayd: set myself as module maintainer
I forgot setting that when creating the module.
2022-05-08 21:44:50 +02:00
Michal Sojka
3effbca0bc usbrelay: 0.9 -> 1.0 2022-05-08 21:16:32 +02:00
github-actions[bot]
6ab1fe48df
Merge staging-next into staging 2022-05-08 18:01:43 +00:00
github-actions[bot]
e92815729d
Merge master into staging-next 2022-05-08 18:01:10 +00:00
Ivan Kozik
9db1d1782b nixos/tinc: unbreak the service
The user is actually tinc.${network}, as Mic92 points out in
https://github.com/NixOS/nixpkgs/pull/171703#discussion_r867506032

Sorry, I broke this in https://github.com/NixOS/nixpkgs/pull/171703 earlier.

coreutils 9.1 chown does not complain in this case with a valid dotted user.
2022-05-08 16:04:20 +00:00
Sandro
befb337461
Merge pull request #169216 from Shawn8901/fix_prometheus_config_generation
nixos/prometheus: use pkgs.formats.json.generate to write config file
2022-05-08 15:09:09 +02:00
github-actions[bot]
c5da241985
Merge staging-next into staging 2022-05-08 12:01:39 +00:00
github-actions[bot]
eaaed3f1d2
Merge master into staging-next 2022-05-08 12:01:07 +00:00
Robert Schütz
2ddfd7e81b nixos/borgmatic: use pkgs.formats.yaml 2022-05-08 01:08:28 -07:00
github-actions[bot]
d2d66da45b
Merge staging-next into staging 2022-05-07 18:01:36 +00:00
github-actions[bot]
84277e82a5
Merge master into staging-next 2022-05-07 18:01:03 +00:00
Rick van Schijndel
17c252aab1
Merge pull request #153940 from tomfitzhenry/phosh-service
nixos/phosh: add Phosh, the Phone Shell
2022-05-07 17:56:44 +02:00
Artturi
1d09b16b0c
Merge pull request #171709 from avdv/fix-illum-segfault-and-restart
illum: Prevent segfault when unplugging keyboards
2022-05-07 17:40:52 +03:00
github-actions[bot]
00e5877c2f
Merge staging-next into staging 2022-05-07 00:02:47 +00:00
github-actions[bot]
fa99b3742a
Merge master into staging-next 2022-05-07 00:02:09 +00:00
Sandro
72565373a4
Merge pull request #170912 from Baughn/master 2022-05-07 01:14:08 +02:00
Sandro
d21ebc62bf
Merge pull request #170851 from danderson/danderson/ts-warn-rpf
nixos/tailscale: warn if strict reverse path filtering is in use.
2022-05-06 23:21:50 +02:00
Svein Ove Aas
dcade93a25 factorio: Add loadLatestSave 2022-05-06 17:50:35 +01:00
github-actions[bot]
ad713fb84e
Merge staging-next into staging 2022-05-06 12:02:39 +00:00
github-actions[bot]
6e0aca3c43
Merge master into staging-next 2022-05-06 12:02:02 +00:00
Janne Heß
764d77f4c3
Merge pull request #124261 from helsinki-systems/feat/state-version-default-warn
nixos/version: Warn about using the default of system.stateVersion
2022-05-06 13:20:43 +02:00
Yureka
96aaf29234
Revert "Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers"
This reverts commit 05417a66e7, reversing
changes made to 53e4f8d237.
2022-05-06 12:38:28 +02:00
github-actions[bot]
4c4d0d6bc3
Merge staging-next into staging 2022-05-06 06:02:20 +00:00
github-actions[bot]
ff5c4d3404
Merge master into staging-next 2022-05-06 06:01:36 +00:00
Rick van Schijndel
32bebf42ea
Merge pull request #171703 from ivan/chown-colon
treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1
2022-05-06 07:20:40 +02:00
David Anderson
3fdac0f981 nixos/tailscale: warn if strict reverse path filtering is in use.
Tailscale uses policy routing to enable certain traffic to bypass
routes that lead into the Tailscale mesh. NixOS's reverse path
filtering setup doesn't understand the policy routing at play,
and so incorrectly interprets some of this traffic as spoofed.

Since this only breaks some features of Tailscale, merely warn
users about it, rather than make it a hard error.

Updates tailscale/tailscale#4432

Signed-off-by: David Anderson <dave@natulte.net>
2022-05-05 18:28:48 -07:00
Sandro
b9e7f61c72
Merge pull request #171747 from danderson/danderson/tailscale-getent
nixos/tailscale: add glibc to PATH.
2022-05-06 03:10:00 +02:00
Sandro
e5e30371bc
Merge pull request #170210 from danderson/danderson/restart-tailscaled
nixos/tailscale: use systemctl restart during activation.
2022-05-06 03:09:01 +02:00
Colin Arnott
ecd8d42397
nextcloud24: init at 24.0.0
Added Nextcloud 23 and set it as the default Nextcloud version for the
NixOS module. Added PHP 8.1 as an option for phpPackage and default for
Nextcloud ≥ 24.
2022-05-06 00:37:39 +00:00
David Anderson
67b1fac192 nixos/tailscale: add glibc to PATH.
For some features, tailscaled uses getent(1) to get the shell
of OS users. getent(1) is in the glibc derivation. Without this
derivation in the path, tailscale falls back to /bin/sh for all
users.

Signed-off-by: David Anderson <dave@natulte.net>
2022-05-05 17:09:27 -07:00
github-actions[bot]
4cab9aed76
Merge staging-next into staging 2022-05-06 00:02:53 +00:00
github-actions[bot]
b962dee3e7
Merge master into staging-next 2022-05-06 00:02:16 +00:00
Bernardo Meurer
323fb482fb
Merge pull request #171634 from luochen1990/patch-2
Fix wg-quick:  always generate postUp issue.
2022-05-05 15:05:19 -07:00
Ivan Kozik
59a76614f3 treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1 2022-05-05 22:05:18 +00:00
Robert Schütz
ccf42c7987 nixos/home-assistant: fix openFirewall 2022-05-05 15:04:46 -07:00
Martin Weinelt
e237f3e459
Merge pull request #171716 from piegamesde/heisenbridge-module 2022-05-05 23:30:09 +02:00
piegames
6b1dcbb1db nixos/heisenbridge: Fix stupid typo 2022-05-05 23:26:01 +02:00
Claudio Bley
fd3d1a834b illum: Restart service on failure
If there is a fatal error and illum exits, it should be safe to restart it.
2022-05-05 22:31:56 +02:00
github-actions[bot]
aba90d9366
Merge master into staging-next 2022-05-05 18:05:32 +00:00
Janne Heß
57cd07f3a9
treewide: pkgs.systemd -> config.systemd.package
This ensures there is only one systemd package when e.g. testing the
next systemd version.
2022-05-05 20:00:31 +02:00
Kerstin Humm
c126babb28 nixos/kanidm: init
Co-Authored-By:  Martin Weinelt <mweinelt@users.noreply.github.com>
Co-Authored-By:  Flakebi <flakebi@t-online.de>
2022-05-05 19:06:13 +02:00
Tom Fitzhenry
e0daeb01a7 programs/phosh: merge into services/x11/desktop-managers/phosh 2022-05-06 00:04:48 +10:00
Tom Fitzhenry
1d7cd163ce nixos/phosh: add Phosh, the Phone Shell 2022-05-06 00:04:48 +10:00
Janne Heß
4c5e7bde3e
nixos/matrix-synapse: Add a defaultText 2022-05-05 12:22:37 +02:00
LuoChen
e4b942eccf wg-quick: fix postUp always generated issue 2022-05-05 16:08:46 +08:00
github-actions[bot]
ae265ec922
Merge master into staging-next 2022-05-05 00:02:31 +00:00
Jan Tojnar
ec0ae174f8 Revert "networkmanager-applet: rename from networkmanagerapplet"
network-manager-applet uses differrent naming scheme from the VPN plug-ins.
Let’s revert to the previous state, for now, to fix eval. We can do the rename later.

This reverts commit cecb014d5d.
2022-05-04 23:29:42 +02:00
Vladimír Čunát
453f19bb85
Merge branch 'master' into staging-next 2022-05-04 21:02:39 +02:00
Sandro
7e4329608c
Merge pull request #170952 from SuperSandro2000/firewalld
firewalld: init at 1.1.1
2022-05-04 20:51:27 +02:00
Kim Lindberger
ad5e4dacb4
Merge pull request #171066 from felixsinger/pkgs/keycloak/update
keycloak: 17.0.1 -> 18.0.0
2022-05-04 20:51:11 +02:00
github-actions[bot]
747719f235
Merge master into staging-next 2022-05-04 18:01:28 +00:00
Bernardo Meurer
9a41fab23f
Merge pull request #171021 from helsinki-systems/feat/systemd-stage-1-udev-improvements 2022-05-04 09:09:09 -07:00
Daniel Fullmer
ad38a2a646 nixos/ssh: remove empty host key files before generating new ones
In a previous PR [1], the conditional to generate a new host key file
was changed to also include the case when the file exists, but has zero
size. This could occur when the system is uncleanly powered off shortly
after first boot.

However, ssh-keygen prompts the user before overwriting a file. For
example:

$ touch hi
$ ssh-keygen -f hi
Generating public/private rsa key pair.
hi already exists.
Overwrite (y/n)?

So, lets just try to remove the empty file (if it exists) before running
ssh-keygen.

[1] https://github.com/NixOS/nixpkgs/pull/141258
2022-05-03 22:09:43 -07:00
Ivan Kozik
96a8c0ac23 nixos/postgresql: use postgres 14 for 22.05
postgresql: alias to postgresql_14
2022-05-03 22:23:08 +00:00
fleaz
8b250ec5af
nixos/r53-ddns: init 2022-05-04 00:16:18 +02:00
Felix Singer
9765ee6bbf keycloak: 17.0.1 -> 18.0.0
Release notes available at https://www.keycloak.org/docs/latest/release_notes/index.html#keycloak-18-0-0.

The way the database port is configured changed in Keycloak 18 and the
old way of including it in the `db-url-host` setting no longer
works. Use the new `db-url-port` setting instead.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
Signed-off-by: Kim Lindberger <kim.lindberger@gmail.com>
2022-05-03 16:12:55 +02:00
github-actions[bot]
00dc0eecc7
Merge staging-next into staging 2022-05-03 12:01:45 +00:00
Matthieu Coudron
5114d91cd8
Merge pull request #169802 from NinjaTrappeur/nin/prosody012 2022-05-03 11:04:17 +02:00
Niklas Hambüchen
73135fb85d
nixos/nebula: Always restart
Without this, if the network goes down for a while, systemd will give up after 5 restarts:

    Scheduled restart job, restart counter is at 5.
    Stopped Nebula VPN service for myvpn.
    nebula@myvpn.service: Start request repeated too quickly.
    Failed with result 'exit-code'.
    Failed to start Nebula VPN service for myvpn.

Most network services need this, but for VPNs it's extra important.
2022-05-02 16:45:44 +02:00
github-actions[bot]
c01e301153
Merge staging-next into staging 2022-05-02 12:06:41 +00:00
Félix Baylac-Jacqué
20693a1e73
prosody: 0.11.13 -> 0.12.0
See https://blog.prosody.im/prosody-0.12.0-released for more
informations.

We remove the various lua wrappers introduced by
6799a91843 and
16d0b4a69f. It seems like we don't need
them anymore. I'm not brave enough to dig into the Lua machinery to
see what resolved that. Sorry, you'll have to trust me on that one.

We should probably think about the migration from http_upload to
http_file_share for the NixOS module. It's not trivial, we need to
make sure we don't break the already uploaded URLs.
2022-05-02 12:43:19 +02:00
Lara
917be9fa32 asterisk: Create symlinks for each config individually
This commit refactors the way how configuration files are deployed to
the `/etc/asterisk` directory.

The current solution builds a Nix derivation containing all config files
and symlinks it to `/etc/asterisk`. The problem with that approach is
that it is not possible to provide additional configuration that should
not be written to the Nix store, i.e. files containing credentials.

The proposed solution changes the creation of configuration files so
that each configuration file gets symlinked to `/etc/asterisk`
individually so that it becomes possible to provide additional config
files to `/etc/asterisk` as well.
2022-05-02 10:32:34 +00:00
Robert Hensing
e4054fe0a9
Merge pull request #169310 from Xiami2012/zookeeper-jre
nixos/zookeeper: Take the same JRE we build zookeeper with by default
2022-05-02 10:51:42 +02:00
Robert Hensing
757278a53c
Merge pull request #170412 from jtojnar/nscd-warning
nixos/nscd: Fix lib.literalExample deprecation
2022-05-02 10:46:11 +02:00
github-actions[bot]
cd9d1feb58
Merge staging-next into staging 2022-05-02 06:01:51 +00:00
Bernardo Meurer
ecfb5500f7
nixos/cloudflare-dyndns: init 2022-05-01 16:50:31 -07:00
github-actions[bot]
677697c12f
Merge staging-next into staging 2022-05-01 18:01:35 +00:00
José Romildo
417b1c12b2 lxqt: add maintainers team 2022-05-01 13:03:21 -03:00
davidak
c60375c5db
Merge pull request #168640 from romildo/upd.enlightenment-team
enlightenment: add maintainers team
2022-05-01 16:32:36 +02:00
José Romildo Malaquias
60a652400b
Merge pull request #170508 from romildo/fix.lxqt
nixos/lxqt: enable libinput
2022-05-01 11:31:51 -03:00
davidak
84bf8a57c1
Merge pull request #168633 from romildo/upd.lumina-team
lumina: add maintainers team
2022-05-01 16:27:40 +02:00
José Romildo
0885172cec nixos/lxqt: enable libinput 2022-05-01 08:55:38 -03:00
github-actions[bot]
676b5fba35
Merge staging-next into staging 2022-05-01 06:01:47 +00:00
davidak
ba3762b8be
Merge pull request #170504 from romildo/upd.mate
nixos/mate: enable libinput
2022-05-01 06:10:54 +02:00
Janne Heß
89ace3967e
nixos/udev: systemd initrd improvements
First, add the builtin udev rules to /etc/udev/rules.d so they are used.
Then, add all networkd .link units to the initrd. This is done in the
old stage 1 as well so I assume this is needed even when networkd is not
used. I assume this is for things like changing the MAC address.

Also limit the number of udev/lib binaries that is put into the initrd
because the old initrd doesn't use all units either.
2022-04-30 14:17:29 +02:00
Sandro Jäckel
cecb014d5d
networkmanager-applet: rename from networkmanagerapplet 2022-04-30 02:26:11 +02:00
github-actions[bot]
5f05f984a6
Merge staging-next into staging 2022-04-30 00:02:41 +00:00
Guillaume Girol
3ff4432670
Merge pull request #170393 from lostnet/couch322
couchdb3: 3.2.1 -> 3.2.2
2022-04-29 19:40:40 +00:00
Sandro
fdc0d007bd
Merge pull request #168804 from jansol/pipewire
pipewire: 0.3.49 -> 0.3.51
2022-04-29 17:08:13 +02:00
happysalada
a4707b645f grafana-mimir: add initial module 2022-04-29 07:23:03 -04:00
Jan Solanti
2b71de4a3d pipewire: 0.3.49 -> 0.3.50 2022-04-29 04:29:12 +03:00
Robert Hensing
527457cadc
Merge pull request #156163 from erdnaxe/galene_hardening
nixos/galene: systemd unit hardening
2022-04-28 10:52:00 +02:00
Bobby Rong
f4f969a484
Merge pull request #170360 from bobby285271/pantheon
Pantheon 7 updates 2022-04-25
2022-04-28 12:44:12 +08:00
Pascal Bach
ee385d8364
Merge pull request #170396 from teto/gitlab-description
services.gitlab-runner: support runner description
2022-04-27 19:30:26 +02:00
Sandro
54b1753b2a
Merge pull request #170505 from romildo/upd.enlightenment
nixos/enlightenment: enable libinput
2022-04-27 18:06:40 +02:00
Sandro
bf0457694b
Merge pull request #169144 from romildo/upd.lxqt
lxqt: 1.0.0 -> 1.1.0
2022-04-27 14:54:54 +02:00
Arnout Engelen
2b85441bb0
Merge pull request #146241 from rgrunbla/wpa_supplicant-fix-writable
wpa_supplicant: prevent writing non-writable configuration
2022-04-27 11:35:49 +02:00
Bobby Rong
782683d551
nixos/pantheon: fix outdated wording in docs 2022-04-27 10:18:16 +08:00
José Romildo
0679095c10 nixos/enlightenment: enable libinput 2022-04-26 18:17:46 -03:00
José Romildo
22b2c47866 nixos/mate: enable libinput 2022-04-26 18:08:47 -03:00
Jan Tojnar
6b738bce80 nixos/nscd: Fix lib.literalExample deprecation
The NixOS evaluation would complain:

trace: warning: literalExample is deprecated, use literalExpression instead, or use literalDocBook for a non-Nix description.
2022-04-26 14:06:52 +02:00
Xiami
b43999bea0
nixos/zookeeper: Remove .passthru as suggested 2022-04-26 18:44:37 +08:00
Matthieu Coudron
c1e318d0c5 services.gitlab-runner: support runner description
The description for the runner in the UI is by default sthg like
"npm_nixos_d0544ed48909" i.e., the name of the attribute.

I wanted to have a more user-friendly description and added a
description to the service.
Seems like gitlab-runner doesn't like having both fields set:
"Cannot use two forms of the same flag: description name"
so I used one or the other.
2022-04-26 11:43:46 +02:00
Will
14fca0ca6f couchdb3: 3.2.1 -> 3.2.2 2022-04-26 09:02:36 +00:00
Rick van Schijndel
4586388f85
Merge pull request #170320 from andersk/negated-version
treewide: Simplify negated uses of versionAtLeast, versionOlder
2022-04-26 07:50:15 +02:00
Anders Kaseorg
6920d8ca42 treewide: Simplify negated uses of versionAtLeast, versionOlder
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2022-04-25 13:35:24 -07:00
David Anderson
c9a1647ade nixos/tailscale: use systemctl restart during activation.
This avoids the scenario where you activate a new config over Tailscale,
and a long delay between the "stop services" and "start services" phases
of the activation script lead to your terminal freezing for tens of
seconds, until tailscaled finally gets started again and the session
recovers.

Per the documentation of stopIfChanged, this is only safe to do if the
service definition is robust to stopping the old process using the new
service definition. As the maintainer of the upstream systemd unit, I
can confirm that Tailscale is robust to this scenario: it has to be
in order to work right on several other distros that just do
unpack-then-restart, rather than the more complex stop-unpack-start
dance.

Signed-off-by: David Anderson <dave@natulte.net>
2022-04-24 23:31:35 -07:00
Sandro
93da45162d
Merge pull request #166321 from wentasah/usbrelay 2022-04-25 02:23:19 +02:00
Linus Heckemann
fc1248c589
Merge pull request #169932 from Ma27/nextcloud-profile-setting
nixos/nextcloud: make `profile.enabled` configurable
2022-04-24 22:50:05 +02:00
Robin Gloster
0d8c3cf64b
Merge pull request #164650 from mayflower/jira-home
nixos/jira: set home for jira user
2022-04-24 14:27:33 +02:00
Maximilian Bosch
9931c4a407
nixos/nextcloud: make profile.enabled configurable
I recently learned that Nextcloud 23's new profile feature — basically a
way for users to share personal contact details — has a problematic
default setting, profile data is shared with **everyone** by default.

This means that an unauthenticated user can access personal information
by accessing `nextcloud.tld/u/user.name`.

The announcement of v23 states[1]:

> We go a step further and introduce a profile page. Here you can put a
> description of yourself, show links to, for example, social media, what
> department you are in and information on how to contact you. All these
> are of course entirely optional and you can choose what is visible to who!
> The profile and user status are accessible also from our mobile and desktop clients.

It's not mentioned that by default you share personal information[3] with
everyone and personally I think that's somewhat problematic.

To work around that, I decided to add an option for the recently added[2]
and even set it to `false` by default to make an explicit opt-in for
that feature.

[1] https://nextcloud.com/blog/nextcloud-hub-2-brings-major-overhaul-introducing-nextcloud-office-p2p-backup-and-more/
[2] https://github.com/nextcloud/server/pull/31624/files
[3] By default, this affects the following properties:
    * About
    * Full name
    * Headline
    * Organisation
    * Profile picture
    * Role
    * Twitter
    * Website
    Phone, Address and Email are not affected and only shown to
    authenticated users by default.
2022-04-23 13:31:50 +02:00
Jonas Heinrich
24b53785cc nixos/create_ap: add module 2022-04-23 07:17:44 -04:00
Jan Tojnar
be9e3fdf7d
Merge pull request #169553 from jtojnar/gnome-default-dark-background
nixos/gnome: Add the NixOS background metadata
2022-04-21 21:36:19 +02:00
Jan Tojnar
cd2a6cd9cb nixos/gnome: Add the NixOS background metadata
This is needed to have it listed in the Control Center.
2022-04-21 20:16:41 +02:00
Jan Tojnar
818ac0c9ae Revert "nixos/gnome3: install nixos wallpapers"
There is no need to install them when they will not be picked up
by the Appearance panel of GNOME Control Center without
a XML metadata file anyway.

They will be pulled into the closure via overrides
so that is not a concern either.

This reverts commit 7f3bc5b8fa.
This reverts commit fa607bc939.
2022-04-21 20:00:29 +02:00
Pascal Bach
d9309f43b3
Merge pull request #155424 from tobim/nixos/snapserver-firewall
nixos/snapserver: don't open ports by default
2022-04-21 19:40:20 +02:00
Jörg Thalheim
aa446f8d3c
Merge pull request #169437 from Mic92/consul
nixos/consul: allow ipv6-only
2022-04-21 07:22:02 +01:00
Sandro
786f0c486b
Merge pull request #159103 from pacien/nixos-taskserver-firewall-no-port-open
nixos/taskserver: do not open firewall port implicitly, port helper to Python 3
2022-04-21 01:56:36 +02:00
Tobias Mayer
0d49836dec
nixos/snapserver: don't open ports by default 2022-04-20 23:25:28 +02:00
Lassulus
b424ce3fd2
Merge pull request #161587 from helsinki-systems/feat/bird2-reload-trigger
nixos/bird: reloadIfChanged -> reloadTriggers
2022-04-20 18:24:05 +01:00
Jörg Thalheim
325a525467
nixos/consul: allow ipv6-only 2022-04-20 17:32:06 +02:00
Lassulus
c29e523824
Merge pull request #163030 from newAM/github-runner-harden
nixos/github-runner: systemd service hardening
2022-04-20 16:30:23 +01:00
Linus Heckemann
5e513b4b24
Merge pull request #167324 from alyssais/mailman-postfix
nixos/{postfix,mailman}: fix ordering between services
2022-04-20 16:34:43 +02:00
Alyssa Ross
572131c6a9
nixos/mailman: ensure Postfix is started after Mailman
On first run, Postfix will refuse to start if it's started before
Mailman is up, because it'll try to read the map files generated
Mailman the first time it's started, and they won't exist yet.  To fix
this, make sure Postfix isn't started until after Mailman is up if
they're both activated at the same time.
2022-04-20 13:17:28 +00:00
Bernardo Meurer
97315af110
Merge pull request #169206 from nbraud/nixpkgs/kmscon/fonts
nixos/kmscon: Add fonts option
2022-04-19 12:57:26 -07:00
Jonas Heinrich
047473aa32 nixos/nextcloud: Support create database locally 2022-04-19 14:35:59 -04:00
Xiami
1637e039d2
nixos/zookeeper: Take the same JRE we build zookeeper with 2022-04-19 18:56:00 +08:00
ajs124
3fedfb5f8a
Merge pull request #110870 from asymmetric/doc/prom-node-exp
docs: modules/prometheus: finish exporter setup
2022-04-18 22:54:01 +01:00
Lassulus
cae8c76a9b
Merge pull request #163130 from xlambein/master
pipewire-media-session: changed options to take defaults from JSON
2022-04-18 19:55:31 +01:00
Michal Sojka
6a5b839069 usbrelay: init at 0.9 2022-04-18 19:02:41 +02:00
Alexandru Scvortov
4646491175 nixos/nbd: fix nbd-server config section ordering
Closes #169103
2022-04-18 17:28:09 +01:00
Shawn8901
7f01ff7822 nixos/prometheus: use pkgs.formats.json.generate to write config file
The old way of writing the file omited qoutes within strings which are needed by some configurations like federations.
The quotes got lost when `echo`ing the content via `echo '${builtins.toJSON x}'`.
The pkgs.formats.json does handle that race condition properly, so this commit switches the writing to that helper.
2022-04-18 18:09:03 +02:00
nicoo
11bbb28f8a nixos/kmscon: Add fonts option 2022-04-18 15:56:34 +02:00
Martin Weinelt
df6fa84709 nixos/nscd: fix manual build 2022-04-18 23:50:46 +10:00
John Ericson
b6f5bf2cf0
Merge pull request #124019 from petabyteboy/feature/unscd2
unscd: init at 0.53
2022-04-17 22:40:53 -04:00
José Romildo
2aa95b9fec lxqt.xdg-desktop-portal-lxqt: init at 0.2.0 2022-04-17 22:08:22 -03:00
Artturi
063155ae92
Merge pull request #169106 from wahjava/fix-headscale-typo
headscale: Fix typo as per systemd.exec(5)
2022-04-18 02:19:15 +03:00
Madoura
b18031c413
treewide/meta: Remove chiiruno and replace with Madouura (#169096)
* maintainers: remove chiiruno

* nixos/zeronet.nix: replace chiiruno with Madouura

* nixos/hydron: replace chiiruno with Madouura

* nixos/tests/bcachefs: replace chiiruno with Madouura

* lutris: replace chiiruno with Madouura

* qtchan: replace chiiruno with Madouura

* tinygo: replace chiiruno with Madouura

* vlang: replace chiiruno with Madouura

* merkletools: replace chiiruno with Madouura

* easyjson: replace chiiruno with Madouura

* quicktemplate: replace chiiruno with Madouura

* statik: replace chiiruno with Madouura

* dumb: replace chiiruno with Madouura

* sndio: replace chiiruno with Madouura

* hydron: replace chiiruno with Madouura

* edid-decode-unstable: replace chiiruno with Madouura

* tewisay: replace chiiruno with Madouura

* svt-av1: replace chiiruno with Madouura
2022-04-18 02:13:36 +03:00
Thiago Kenji Okada
353ba1b6e1
Merge pull request #127367 from oxalica/fix/dm-only-autostart
nixos/desktop-manager/none: add option to run XDG autostart files
2022-04-17 23:42:22 +01:00
Ashish SHUKLA
4a973081b3
headscale: Fix typo as per systemd.exec(5) 2022-04-18 02:00:29 +05:30
pennae
04b5d464ba
Merge pull request #169029 from LeSuisse/nixos-tailscale-cert-uid
nixos/tailscale: allow to set `TS_PERMIT_CERT_UID` env variable
2022-04-17 19:51:31 +00:00
Janne Heß
69c18b0eab
Merge pull request #167051 from pacien/ssmtp-removal
ssmtp: drop unmaintained program and module
2022-04-17 21:09:14 +02:00
github-actions[bot]
f6bedc13d1
Merge master into staging-next 2022-04-17 18:01:03 +00:00
oxalica
45ba086ea5 nixos/desktop-manager/none: add option to run XDG autostart files
`fcitx5` and `service.earlyoom` rely on use XDG autostart files to start.
But for X session with only window manager and no desktop manager
(`none` is used), no one can start them.

This options is added to run these autostart files for sessions without
desktop manager to make other services just work.
2022-04-18 01:13:59 +08:00
Silvan Mosberger
4de6cbc904
Merge pull request #168551 from infinisil/syncplay-no-gui
syncplay: Allow disabling GUI
2022-04-17 19:05:29 +02:00
Martin Weinelt
5bd659fb4d
Merge pull request #167866 from NickCao/dendrite-limit 2022-04-17 16:01:34 +02:00
Thomas Gerbet
f89894e2e3 nixos/tailscale: allow to set TS_PERMIT_CERT_UID env variable
This setting was introduced with Tailscale 1.22.0, see
https://github.com/tailscale/tailscale/releases/tag/v1.22.0

Co-authored-by: pennae <github@quasiparticle.net>
2022-04-17 12:13:24 +02:00
pacien
68128e7b7e nixos/nagios: replace ssmtp package use with msmtp
The ssmtp program is not maintained and is being removed.

GitHub: see https://github.com/NixOS/nixpkgs/issues/105710
2022-04-17 00:44:50 +02:00
Milan Pässler
517c17420f nixos/nscd: add package option 2022-04-16 14:47:47 -04:00
github-actions[bot]
6be56bfc2e
Merge master into staging-next 2022-04-16 12:01:10 +00:00
Luflosi
faad370edc nixos/ipfs: fix the services.ipfs.autoMigrate option
Apparently this was never properly tested and never worked. When the IPFS repo needs upgrading, the first call to ipfs, which is run before running the migration, fails with the error message "Error: ipfs repo needs migration".
To fix this, simply run the migration before any `ipfs config` calls but don't run it when `dataDir` is empty and we need to call `ipfs init`.
Writing a NixOS test for this would require keeping at least two versions of IPFS in Nixpkgs, which we don't currently do.
2022-04-16 07:38:13 -04:00
Luflosi
8a5e51525d nixos/ipfs: add Luflosi as maintainer 2022-04-16 07:38:13 -04:00
Luflosi
6b2eca8d56 nixos/ipfs: remove unused code
This code became obsolete with 4044d81d5c, just a couple days after it was introduced.
2022-04-16 07:38:13 -04:00
Nick Cao
70d0e24568 nixos/logrotate: use packages from buildPackages in configuration checkPhase, fixing cross compilation 2022-04-16 10:22:39 +02:00
Nick Cao
b79e0a0e06
nixos/dendrite: set LimitNOFILE to 65535 2022-04-16 10:49:01 +08:00
Martin Weinelt
2bd8fc9378 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-16 00:52:15 +02:00
Luflosi
17a406f28a
nixos/matrix-synapse: fix typo in mkRemovedOptionModule replacementInstructions
The correct capitalisation is lower-case here.
2022-04-15 22:52:29 +02:00
Lassulus
2bd0053d94
Merge pull request #162509 from mkg20001/haste
haste-server: init at 3dcc43578b99dbafac35dece9d774ff2af39e8d0
2022-04-15 21:08:27 +01:00
Kim Lindberger
ce2895263d
Merge pull request #167378 from talyz/keycloak-quarkus
keycloak: Switch to the new Quarkus version of Keycloak
2022-04-15 22:02:42 +02:00
github-actions[bot]
40f288fa90
Merge master into staging-next 2022-04-15 18:01:30 +00:00
Michele Guerini Rocco
68a102a2e4
Merge pull request #168764 from rnhmjoj/pr-pdns-ncdns
nixos/ncdns: listen on IPv6 by default
2022-04-15 17:34:57 +02:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Michele Guerini Rocco
09f816e976
Merge pull request #156401 from TLATER/tlater/gitea-hide-secrets
nixos/gitea: Prevent secrets from being exposed at ExecStart time
2022-04-15 10:26:12 +02:00
rnhmjoj
d39a10daa8
nixos/ncdns: listen on IPv6 by default 2022-04-14 21:07:15 +02:00
github-actions[bot]
795332a20e
Merge staging-next into staging 2022-04-14 18:01:48 +00:00
rnhmjoj
fd480f55df
nixos/pdns-recursor: update default values
1. Update the default values of several addresses-related settings
   that have been changed by upstream.

2. Make `dns.address` take multiple addresses. This is needed
   for dual stack, now working by default.
2022-04-14 17:31:16 +02:00
José Romildo
8773488cc8 enlightenment: add maintainers team 2022-04-14 11:28:21 -03:00
José Romildo
e132736d0d lumina: add maintainers team 2022-04-14 10:27:47 -03:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Jan Tojnar
5db9253633 nixos/desktop-managers: Fix eval
nixos/lib/utils.nix is actually passed as `utils` argument to modules
so https://github.com/NixOS/nixpkgs/pull/168194 broke the eval.

Fixes: https://github.com/NixOS/nixpkgs/issues/168569
2022-04-14 06:53:08 +02:00
Silvan Mosberger
bf123996f9 nixos/syncplay: Switch to version without GUI 2022-04-13 23:58:51 +02:00
Jan Tojnar
7eb14b532a nixos/gnome: set default wallpaper for dark mode as well
GNOME 42 needs two wallpaper pictures – for the default (light)
colour scheme and for the dark one. Because we are clearing out
the paths in `gsettings-desktop-schemas` to prevent closure
from bloating, we need to set them in the NixOS module.

Since the wallpaper for the default colour scheme is dark,
will relegate it to the dark colour scheme and switch
to a light blue variant for the default colour scheme.
That one has inverted roundel for the NixOS logo but
it is the only light-ish background that has the logo
of the same size and placing as the dark wallpaper.
2022-04-13 21:29:51 +02:00
Thiago Kenji Okada
3a570f57a1
Merge pull request #167775 from otavio/topic/improve-shellhub-module
nixos: shellhub-agent: support more options
2022-04-13 19:56:14 +01:00
Thiago Kenji Okada
f1d21bed4d
Merge pull request #168196 from lucasew/fix/xfce-screensaver
nixos/xfce4: option to disable xfce4-screensaver
2022-04-13 14:35:49 +01:00
lucasew
e76aa74c28 nixos/xfce: option to disable xfce4-screensaver
Signed-off-by: lucasew <lucas59356@gmail.com>
2022-04-13 09:13:03 -03:00
Silvan Mosberger
398973f7eb
Merge pull request #168292 from whentze/cockroach-module-improvements
nixos/cockroachdb: add `extraArgs` and properly escape systemd exec args
2022-04-13 13:48:17 +02:00
Sandro
a39694b41f
Merge pull request #168194 from SuperSandro2000/xserver-excludePackages
Xserver exclude packages
2022-04-13 11:37:32 +02:00
Martin Weinelt
2731137d12
Merge pull request #168288 from erikarvstedt/paperless-ngx 2022-04-12 22:10:52 +02:00
Lassulus
65cc198539
Merge pull request #167349 from helsinki-systems/feat/udev-systemd-stage-1
nixos/udev: Add systemd stage 1 support
2022-04-12 21:02:52 +01:00
Linus Heckemann
0acfc5ed6e
Merge pull request #167323 from alyssais/mailman-ext_dir
nixos/mailman: remove obsolete setting
2022-04-12 21:27:27 +02:00
Janne Heß
7024b4e5e3
nixos/udev: Put all initrd options into a namespace 2022-04-12 20:06:13 +01:00
Erik Arvstedt
0977227b86
nixos/paperless-ng: rename to paperless, use paperless-ngx package
Use this opportunity to rename `paperless-(ng)-server` to `paperless-scheduler`.
This follows the naming scheme in the paperless repo and docs.
2022-04-12 18:15:44 +02:00
Erik Arvstedt
46c3331384
nixos/paperless-ng: simplify redis logic
- Rename `hasCustomRedis` -> `enableRedis`
- Extract var `redisServer`
2022-04-12 18:06:34 +02:00
talyz
ed30d3b02f
keycloak: Switch to the new Quarkus version of Keycloak
With version 17 of Keycloak, the Wildfly based distribution was
deprecated in favor of the one based on Quarkus. The difference in
configuration is massive and to accommodate it, both the package and
module had to be rewritten.
2022-04-12 13:42:54 +02:00
Kim Lindberger
9d12de1ab7
Merge pull request #165481 from talyz/discourse-2.9.0.beta3
discourse: 2.9.0.beta1 -> 2.9.0.beta3
2022-04-12 10:38:16 +02:00
Wanja Hentze
dccd5a44d1
nixos/cockroachdb: use escapeSystemdExecArgs for ExecStart args
Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2022-04-12 10:34:56 +02:00
Wanja Hentze
d215163ff9
nixos/cockroachdb: add extraArgs option
There are a bunch of args to `cockroach start` that simply can not be set
given the current set of options, so this escape hatch enables them.
2022-04-12 10:34:55 +02:00
Lassulus
807b226542
Merge pull request #162777 from amarshall/prom-deprecated-opt
nixos/prometheus: Remove upstream-deprecated alertManagerTimeout
2022-04-12 09:07:51 +01:00
Andrew Marshall
3bbfc7849e nixos/prometheus: Remove upstream-deprecated alertManagerTimeout
When started, Prometheus prints:

> The flag --alertmanager.timeout has no effect and will be removed in
> the future.

See also
2316062d4e
2022-04-11 23:37:33 -04:00
Erik Arvstedt
69319ee4a6
nixos/paperless-ng: fix /proc access for service
This allows django-q to set the number of workers according to the CPU
core count and to show memory stats via `manage.py qmonitor`.
This also fixes a non-critical psutil error in paperless-ng-server.
2022-04-11 22:46:44 +02:00
Erik Arvstedt
308c4bf0f7
nixos/paperless-ng: minor improvments
Service:
- Fix misleading comment:
  We could in fact implement password copying as a preStart script by
  amending BindReadOnlyPaths, but adding an extra service is simpler.

Test:
- Add more detailed subtest names
- Simplify date check
2022-04-11 22:46:43 +02:00
Izorkin
e87240e216 nixos/nginx: add extraParameters to http3 protocol 2022-04-11 22:33:12 +02:00
Izorkin
c508da303b nixos/nginx: add reuseport option 2022-04-11 22:33:12 +02:00
Izorkin
660a36f173 nixos/nginx: fix http3 configuration 2022-04-11 22:33:12 +02:00
Janne Heß
fb44ecd129
nixos/udev: Add systemd stage 1 support 2022-04-11 19:43:26 +01:00
Sandro Jäckel
28539842d8
nixos/utils: move removePackagesByName to here from gnome 2022-04-11 15:42:49 +02:00
Lassulus
ace8357011
Merge pull request #143878 from Izorkin/init-nifi
nifi: init at 1.16.0
2022-04-11 14:08:29 +01:00
Alyssa Ross
46a3a7b9a2 nixos/udev: remove rule for kqemu
kqemu was removed from Nixpkgs in 2013 in 181dc4032d ("Remove the old
KQEMU accelerator module"), so it should be safe to drop this rule
now.
2022-04-11 12:17:03 +00:00
Sandro Jäckel
28e936ba64
nixos/xserver: add excludePackages option
to remove packages environment.systemPackages
2022-04-11 01:12:04 +02:00
pennae
3acf560427
Merge pull request #165883 from alyaeanyx/openconnect-module
nixos/openconnect: Add NixOS module for declarative OpenConnect VPNs
2022-04-10 21:30:26 +00:00
Izorkin
d706301b0c
nixos/nifi: init service 2022-04-10 20:42:00 +03:00
Otavio Salvador
fcb69a8583 nixos/shellhub-agent: use package internally, avoiding it in PATH
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador
d7a0f56c6a nixos/shellhub-agent: avoid code duplication for environment
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador
bd3b046ac8 nixos/shellhub-agent: use mkPackageOption to simplify code
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador
8c4bc7f62c nixos/shellhub-agent: allow setting the preferredHostname
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Vladimír Čunát
5e845236f2
Merge branch 'staging-next' into staging 2022-04-10 17:11:36 +02:00
alyaeanyx
e4c93fb04c
nixos/openconnect: add hardening flags 2022-04-10 14:19:22 +02:00
Lassulus
df7337ebb4
Merge pull request #166456 from mweinelt/isc-dhcp
dhcp: 4.4.2-P1 -> 4.4.3 and make client & relay support optional
2022-04-10 11:05:29 +01:00
Lassulus
adc7fbbcdf
Merge pull request #164531 from jtojnar/networkmanager
nixos/networkmanager: Allow overriding installed plug-ins
2022-04-10 11:03:36 +01:00
github-actions[bot]
28c6c88d42
Merge staging-next into staging 2022-04-10 00:02:52 +00:00
Otavio Salvador
6729653309 nixos/shellhub-agent: allow setting the keepAliveInterval
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Otavio Salvador
60158bfc22 nixos/shellhub-agent: use new configuration variables
The old variables still work but will eventually stop to be supported so
move to the new ones.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Otavio Salvador
a62471fc65 nixos/shellhub-agent: use mkEnableOption to simplify code
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Linus Heckemann
918a149888
Merge pull request #167322 from alyssais/mailman-webHosts
nixos/mailman: improve empty webHosts error
2022-04-09 20:15:33 +02:00
Linus Heckemann
0eba1fd840
Merge pull request #142005 from sorpaas/patch-6
nixos/mailman: use separate virtualHosts
2022-04-09 20:14:55 +02:00
github-actions[bot]
55db28db36
Merge staging-next into staging 2022-04-09 18:01:56 +00:00
Alexander Bantyev
7bbf0f0ec9
Merge pull request #166756 from ilya-fedin/mate-fixes
mate: fix inactive settings and make session work without display managers
2022-04-09 17:47:48 +03:00
Artturi
aab655c554
Merge pull request #166997 from Artturin/udiskss 2022-04-09 16:09:11 +03:00
github-actions[bot]
f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Frederik Rietdijk
1d63f89caa cudaPackages: overhaul of how we package cuda packages
There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
2022-04-09 08:50:22 +02:00
Otavio Salvador
6175188591 nixos/shellhub-agent: reformat code using nixpkgs-fmt
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-08 19:23:23 -03:00
github-actions[bot]
c57af6e8b0
Merge staging-next into staging 2022-04-08 18:11:40 +00:00
Sandro
45b9690a75
Merge pull request #147975 from andersk/mozillavpn 2022-04-08 15:32:45 +02:00
github-actions[bot]
a36cec68d4
Merge staging-next into staging 2022-04-08 12:02:01 +00:00
Alyssa Ross
c099ec6aff nixos/klogd: remove
This module only has an effect for ancient kernel versions we don't
support.
2022-04-08 09:56:09 +00:00
alyaeanyx
0c066f0d0e
nixos/openconnect: add module 2022-04-08 11:39:09 +02:00
github-actions[bot]
fef4299129
Merge staging-next into staging 2022-04-07 18:01:52 +00:00
pennae
3838b7e07e
Merge pull request #166894 from CameronNemo/nixos-mod-envoy
nixos/envoy: init
2022-04-07 16:23:12 +00:00
Cameron Nemo
1b4b16e1bd nixos/envoy: init 2022-04-07 14:43:53 +00:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
github-actions[bot]
42ec765901
Merge master into haskell-updates 2022-04-06 00:11:25 +00:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
pennae
04ce3788d3
Merge pull request #167381 from jonringer/qtile-module-fixes
nixos/qtile: fixes
2022-04-05 22:08:56 +00:00
sternenseemann
fb2fc3b4a4 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-05 21:21:42 +02:00
Jonathan Ringer
f8002a6687
nixos/qtile: expose package option 2022-04-05 12:11:27 -07:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Jonathan Ringer
c2828e8479
nixos/qtile: expose unwrapped package to systemPackages 2022-04-05 10:43:15 -07:00
Robert Hensing
39e0bd705b
Merge pull request #165259 from Luflosi/ipfs-recursiveUpdate
nixos/ipfs: use lib.recursiveUpdate instead of // operator
2022-04-05 19:16:39 +02:00
Alyssa Ross
fb2fa1b50f
nixos/postfix: pull setup into its own unit
Consider a service that generates postfix lookup tables with
postmap(1), like Mailman.  It needs the Postfix configuration file to
exist, but Postfix qmgr needs all the lookup tables its configured
with to exist before it starts.  So the service that runs postmap
needs to run after the Postfix configuration and directory structure
is generated, but before Postfix itself is started.  To enable this,
we split Postfix into two units: a oneshot unit that sets up the
configuration, and a longrun unit that supervises the Postfix
daemons.  The postmap services can then be inserted in between these
two units.
2022-04-05 10:24:34 +00:00
Alyssa Ross
e7c301df52
nixos/mailman: remove obsolete setting
This was dropped in mailman 3.2.0.
2022-04-05 10:22:21 +00:00
Alyssa Ross
f4a0bb8334
nixos/mailman: improve empty webHosts error
Now this configuration mistake will generate the assertion message,
instead of "error: list index 0 is out of bounds".
2022-04-05 10:18:57 +00:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
789aea7658
Merge master into haskell-updates 2022-04-05 00:11:09 +00:00
github-actions[bot]
5844b1c2fa
Merge master into staging-next 2022-04-04 18:01:27 +00:00
Bjørn Forsman
c1af79c69d nixos/ethminer: only pull in nvidia_x11 when needed
Only people using CUDA need it.
2022-04-04 19:27:20 +02:00
github-actions[bot]
17eb9da14b
Merge staging-next into staging 2022-04-04 12:06:26 +00:00
github-actions[bot]
ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
Bjørn Forsman
966953354c nixos/ethminer: fix option types for maxPower, recheckInterval
Neither power nor time intervals can be negative, let's use unsigned
int.
2022-04-04 11:50:24 +02:00
Bjørn Forsman
5e38d36a6b nixos/ethminer: only pull in cudatoolkit when needed 2022-04-04 11:50:24 +02:00
Tristan Daniël Maat
3a86b88ef1
nixos/gitea: Prevent secrets from being exposed at ExecStart time
This addresses #156400 for Gitea.
2022-04-04 01:12:27 +01:00
github-actions[bot]
493d6516dd
Merge master into haskell-updates 2022-04-04 00:11:26 +00:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00