nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 19:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
444,211 Commits 267 Branches 125 Tags 5.7 GiB
7a6c0bb468
Commit Graph

23989 Commits

Author SHA1 Message Date
Luke Granger-Brown
5a236902c3
Merge pull request #208723 from gador/paperless-ngx-add-poppler 
paperless-ngx: fix build
 2023-01-02 22:36:05 +00:00
Maximilian Bosch
865723cd53
Revert "nixos/stage-1: fix modprobe in initial ramdisk on systems w/glibc-2.34" 
This reverts commit da905d4cf9.

See the commit linked above for further information on why this was
needed. Apparently this is not needed anymore because the need for
LD_LIBRARY_PATH (which is needed for `modprobe(8)` to find
`libpthread.so.0`) doesn't exist anymore.

Since d33e52b253 the library path of each
binary in extra-utils is patched correctly.
 2023-01-02 21:35:35 +01:00
Jörg Thalheim
34f4701127
Merge pull request #208784 from SuperSandro2000/nix-ld 
nixos/nix-ld: fix example texts
 2023-01-02 18:56:06 +00:00
github-actions[bot]
d8b859a780
Merge staging-next into staging 2023-01-02 18:01:43 +00:00
Sandro Jäckel
0b9f76a8d3
nixos/nix-ld: fix example texts 2023-01-02 18:46:13 +01:00
Winter
15013b3054
darwin.builder: prefer shutting down over halting VM (#208450) 
This is preferable because it prevents things like disk corruption (requiring the user to delete the disk image when starting up) that I consistently ran into.
 2023-01-02 07:36:41 -08:00
Florian Brandes
b406baead8 nixos/paperless-ngx: reorder "after" keyword 
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
 2023-01-02 16:25:34 +01:00
Florian Brandes
5b6881f4a0 nixos/paperless-ngx: fix startup order 
The nixOS test failed sporadically with a timeout.
This is due to a race condition in the startup  of
the scheduler vs the task-queue.

The scheduler runs the migration scripts in "pre-start" and
celery isn't available, yet. The celery worker (paperless-task-queue)
was already started by systemd but was unable to connect
(as the migration scripts from "pre-start" still ran).

This fix adds the necessary "after" condition in the systemd
worker unit and adds a test to "paperless"

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
 2023-01-02 15:21:45 +01:00
github-actions[bot]
ccef3ab7d8
Merge staging-next into staging 2023-01-02 12:02:01 +00:00
Maximilian Bosch
0cd88dbc60
nixos/gitea: adapt configs for 1.18 
Co-authored-by: Izorkin <izorkin@elven.pw>
 2023-01-02 11:19:04 +01:00
Enno Richter
ed060ff92b prometheus-exporters: update rspamd exporter for prometheus-json-exporter >=0.5.0 2023-01-02 06:36:22 +01:00
Jan Tojnar
5810109b42 Merge branch 'staging-next' into staging 
- readline6 attribute removed from all-packages.nix in d879125d61
- readline attribute was bumped to readline82 in 50adabdd60
 2023-01-02 03:04:32 +01:00
Naïm Favier
37e42d01a0
nixos/etc: skip resolv.conf in nixos-enter chroot 
nixos-enter sets up /etc/resolv.conf as a bind mount from the host
system, so trying to activate a system that sets
`environment.etc."resolv.conf"` (e.g. with systemd-resolved enabled)
results in an unhelpful warning.

Skip linking /etc/resolv.conf if we're in a nixos-enter environment, as
determined by the IN_NIXOS_ENTER environment variable.

Make the warnings more helpful, indicating which file we failed to link.

Unlink temporary files in case of failure.
 2023-01-02 01:41:29 +01:00
Sandro
6dcdffe4d6
Merge pull request #207134 from SuperSandro2000/nox-pipewire-mpv 2023-01-01 22:14:02 +01:00
Jörg Thalheim
655e072533 nixos/bcachefs: fix boot with systemd enabled initrd 2023-01-01 19:58:16 +01:00
Naïm Favier
a5b7b6e47a
nixos/nixos-enter: hide systemd-tmpfiles errors 
Due to missing `/etc/machine-id` in the new root, systemd-tmpfiles
outputs a bunch of scary warnings like "Failed to replace specifiers in
'/run/log/journal/%m'". We only care about /tmp, so hide them.

`-E` is an alias for `--exclude-prefix=/dev --exclude-prefix=/proc
--exclude-prefix=/run --exclude-prefix=/sys`.
 2023-01-01 17:18:20 +01:00
Naïm Favier
c72f5995e4
Merge pull request #205933 from ncfavier/nix-auto-allocate-uids 2023-01-01 14:18:25 +01:00
Naïm Favier
1596c87bdb
Merge pull request #195945 from ncfavier/wg-quick-nftables 2023-01-01 14:13:01 +01:00
Robert Hensing
70dab2843f
Merge pull request #208168 from hercules-ci/lib-types-string-coercions 
`types.path`: Do not allow lists of strings
 2023-01-01 13:46:55 +01:00
Naïm Favier
6a166a5ab1
Merge pull request #199425 from Mikilio/master 2023-01-01 11:15:03 +01:00
0x4A6F
7e159b1a67 nixos/cloudflared: systemd dependency fix 
- also wait for network-online.target:
  fixes startup error on reboot without functioning networking
- restart on-failure (upstream service definition)
 2023-01-01 11:01:02 +01:00
Ryan Lahfa
06542b21a0
Merge pull request #205636 from LoveIsGrief/webhook-module 
nixos/webhook: add support for a webhook service option
 2022-12-31 22:31:38 +01:00
Moritz 'e1mo' Fromm
59c28cab1c
nixos/parsedmarc: follow upstream configuration 
> Starting in version 8.0.0, most options from the `imap` section have
been moved to the `mailbox` section.

6b2131f0e8
 2022-12-31 16:42:41 +01:00
Robert Hensing
834f0d660a lib.strings: isMoreCoercibleString -> isConvertibleWithToString 
Yes, this function name is inconveniently long, but it is important
for the name to explicitly reference the function and not be mistaken
for the implicit string conversions, which only happen for a smaller
set of values.
 2022-12-31 01:33:47 +01:00
Robert Hensing
5b8de3d9d8 nixos/self-deploy: Cleanup after types.path is not allowed to be a list anymore 2022-12-31 01:03:25 +01:00
Robert Hensing
fed5dc66f8 treewide: isCoercibleToString -> isMoreCoercibleToString 
No change in behavior.
 2022-12-31 01:03:24 +01:00
Naïm Favier
fe51ed28f3
Merge pull request #208033 from ncfavier/systemd-boot-skip-regression 2022-12-30 20:45:56 +01:00
0x4A6F
3b67e9f841
Merge pull request #206674 from jyooru/fix/nixos/cloudflared 
nixos/cloudflared: fix invalid systemd unit, required options with defaults
 2022-12-30 17:30:51 +01:00
Raito Bezarius
1db2175e7a nixos/garage: provide multiple versions to provide an upgrade path when using NixOS service 
- Add mention to release notes 23.05
- Introduce Garage v0.8
- Protect against unexpected upgrade with stateVersion
- Test matrix over 0.7 × 0.8
 2022-12-30 15:12:44 +01:00
Ryan Lahfa
b869fc7a90
Merge pull request #204669 from n8henrie/configurable-grub-efi-timeout 
nixos/installer/cd-dvd/iso-image: honor EFI boot timeout
 2022-12-30 14:25:26 +01:00
Ryan Lahfa
30307eba48
Merge pull request #207453 from p-h/ulogd 
ulogd: init at 2.0.8
 2022-12-30 14:13:53 +01:00
Joel
4c365aa9fc
nixos/cloudfared: fix options that are required having defaults 
> ERR Couldn't start tunnel error="The last ingress rule must match all URLs (i.e. it should not have a hostname or path filter)"
 2022-12-30 20:54:06 +10:00
Joel
1cee5ecfeb
nixos/cloudflared: fix invalid systemd unit description 2022-12-30 20:54:06 +10:00
alyaeanyx
ebe0608ada nixos/openconnect: fix null cases for user and passwordFile options 2022-12-30 10:10:54 +01:00
Naïm Favier
9fdbf01835
Merge pull request #188002 from Izorkin/update-nginx-brotli 2022-12-29 16:24:05 +01:00
figsoda
403c65ab00
Merge pull request #207875 from SuperSandro2000/nixos-kuma-fix-link 
nixos/uptime-kuma: fix link
 2022-12-29 10:18:21 -05:00
Izorkin
4a7d0140a0
nixos/nginx: add recommended brotli settings 2022-12-29 18:14:35 +03:00
Sandro
2c421416da
Merge pull request #207913 from SuperSandro2000/grafana-localhost 
Closes https://github.com/NixOS/nixpkgs/issues/207769
 2022-12-29 15:43:40 +01:00
Sandro
de1b8b9c0f
Update nixos/modules/services/monitoring/uptime-kuma.nix 
Co-authored-by: figsoda <figsoda@pm.me>
 2022-12-29 15:41:04 +01:00
Naïm Favier
80665d606a
nixos/systemd-boot: skip EFI update to 252 
That version has a regression that leaves some machines unbootable.
While we wait for the fix (252.2) to land in master, this is a workaround that
should save people some pain.
 2022-12-29 14:06:40 +01:00
K900
14a61e74be
Merge pull request #208220 from K900/more-supergfx-fixups 
nixos/supergfxd: make config file read/write
 2022-12-29 15:58:50 +03:00
Maximilian Bosch
6873c69ada
Merge pull request #207774 from NetaliDev/pdns-secretfile 
nixos/powerdns: add secretFile option
 2022-12-29 12:28:13 +01:00
K900
25bb55495b nixos/supergfxd: make config file read/write 2022-12-29 14:17:24 +03:00
github-actions[bot]
df1fb5ef89
Merge staging-next into staging 2022-12-29 06:01:46 +00:00
Will Fancher
3d7270abd5
Merge pull request #203171 from ElvishJerricco/zfs-fix-requested-credentials 
nixos/zfs: Ensure pool has datasets to decrypt
 2022-12-29 00:00:29 -05:00
Sandro Jäckel
7e0588b2fb
nixos/grafana: listen on localhost by default (again) 2022-12-29 03:00:14 +01:00
Lucas Franceschino
e8e932bc80
nixos/webhook: init 2022-12-29 01:24:46 +01:00
github-actions[bot]
351a07ba79
Merge staging-next into staging 2022-12-29 00:03:11 +00:00
Naïm Favier
e182da8622
Merge pull request #206939 from tavi-vi/tinc-restart-fix 2022-12-28 22:21:41 +01:00
Sandro
451fbb186b
nixos/hedgedoc: update features note with hedgedoc (#199053) 
Co-authored-by: Naïm Favier <n@monade.li>
 2022-12-28 21:52:58 +01:00
Anderson Torres
5f5b7824cb
Merge pull request #132694 from arcnmx/binfmt-interp-sandbox 
nixos/binfmt: add interpreter path to sandbox
 2022-12-28 17:33:46 -03:00
Sandro
1fc59dfbc7
Merge pull request #206102 from 4z3/exim-can-credentials 2022-12-28 20:53:22 +01:00
github-actions[bot]
aaaeebad7a
Merge staging-next into staging 2022-12-28 18:01:50 +00:00
Jörg Thalheim
741a0f5a7f envfs: init at 1.0.0 2022-12-28 16:03:49 +01:00
Robert Hensing
91050a9d9d nixos/macos-builder: Remove unnecessary paragraph 
I was considering the broader context of stateVersion, but the
macos builder does not enable documentation, making this paragraph
a distraction.
 2022-12-28 14:38:36 +01:00
Robert Hensing
62c8b5bf85 nixos/macos-builder: Simplify error message 
The `system` argument is usually implied, and not hard to figure out.

Co-authored-by: Gabriella Gonzalez <Gabriel439@gmail.com>
 2022-12-28 14:38:04 +01:00
Robert Hensing
30548793ab darwin.builder: Avoid unnecessary dependency on stateVersion 2022-12-28 14:37:02 +01:00
Robert Hensing
f03c7fb8d4 nixos/version: Only warn about unset stateVersion if used 
If a configuration does not use services that depend on the
stateVersion, it does not need to be set.

This provides an incentive for services not to rely on
stateVersion, and not to burden users with this.
 2022-12-28 14:35:14 +01:00
Artturi
a65df1ed0b
Merge pull request #193894 from amjoseph-nixpkgs/pr/nixos/arch-without-inferiors 2022-12-28 15:08:09 +02:00
Jörg Thalheim
d165c5dcad
Merge pull request #204254 from raphaelr/initrd-openvpn 
nixos/tests/initrd-network-openvpn: fix
 2022-12-28 12:36:27 +00:00
Bjørn Forsman
0f0929f4aa nixos/borgbackup: fix ~/.cache, ~/.config ownership 
Invoke `install` separately for each directory to get ownership right --
i.e. not always owned by root. When owned by root, user sessions break
as no user processes are allowed to create directores there. On normal
systems the directories already exist, but in clean environments / NixOS
test VMs, the bug shows.

Before:
  $ namei -l /home/user1/.cache/borg
  f: /home/user1/.cache/borg
  drwxr-xr-x root  root  /
  drwxr-xr-x root  root  home
  drwx------ user1 users user1
  drwxr-xr-x root  root  .cache
  drwxr-xr-x user1 users borg

After:
  $ namei -l /home/user1/.cache/borg
  f: /home/user1/.cache/borg
  drwxr-xr-x root  root  /
  drwxr-xr-x root  root  home
  drwx------ user1 users user1
  drwxr-xr-x user1 users .cache
  drwxr-xr-x user1 users borg
 2022-12-28 13:07:16 +01:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging 
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
 2022-12-28 09:35:37 +00:00
Ryan Lahfa
861c7b189c
Merge pull request #182360 from Yarny0/cups-pdf 
cups-pdf(-to-pdf): init
 2022-12-28 09:08:49 +01:00
figsoda
9a2e72335c
Merge pull request #208045 from figsoda/fix-env 
nixos/environment: fix variables type
 2022-12-27 21:47:02 -05:00
figsoda
9d7339877a nixos/environment: fix variables type 2022-12-27 21:09:10 -05:00
Janne Heß
18be00a2d9
Merge pull request #207801 from ElvishJerricco/systemd-stage-1-test-instrumentation 
systemd-stage-1: Improve test-instrumentation output
 2022-12-28 01:43:03 +01:00
Sandro
ad8ae1b208
Merge pull request #207754 from leona-ya/paperless-ngx/fix-module-1.10.2 
fixes https://github.com/NixOS/nixpkgs/issues/207965
 2022-12-28 01:05:49 +01:00
Philippe Hürlimann
bcbedfeefc nixos/ulogd: init 
Heavily based on original work by xvuko

Co-authored-by: xvuko <nix@vuko.pl>
 2022-12-28 00:17:28 +01:00
Samuel Dionne-Riel
d5f5ec1628
Merge pull request #207371 from samueldr/feature/new_kernel-no-zfs 
nixos: Add new_kernel_no_zfs image variants
 2022-12-27 16:14:16 -05:00
figsoda
0eef5edd1f
Merge pull request #201427 from figsoda/path-var 
nixos/environment: accept path for variables and sessionVariables
 2022-12-27 15:02:29 -05:00
K900
e59753591b
Merge pull request #192285 from illdefined/akkoma 
akkoma: init at 3.5.0
 2022-12-27 22:30:10 +03:00
Sandro
73c0b5c4e8 nixos/users-groups: make isNormalUser description readable 2022-12-27 18:23:21 +01:00
Naïm Favier
3fc528ff7f
Merge pull request #207095 from ncfavier/linux-custom-kernel 2022-12-27 17:10:43 +01:00
Naïm Favier
0d436e1bb6
Merge pull request #207105 from ncfavier/iso-xlibs 2022-12-27 16:19:33 +01:00
Domen Kožar
93fb6f14eb
Merge pull request #207960 from domenkozar/cachix-agent-reliability 
cachix-agent: always restart
 2022-12-27 15:15:50 +00:00
Domen Kožar
19fe841d8a
Merge pull request #207902 from Gabriella439/gabriella/fix_rebuilds 
darwin.builder: Fix gratuitous rebuilds
 2022-12-27 15:12:19 +00:00
Mikael Voss
2490ee906e
nixos/akkoma: init 2022-12-27 14:37:00 +01:00
Domen Kožar
3148ec4f6c cachix-agent: always restart 2022-12-27 12:24:01 +00:00
Jörg Thalheim
f0d4971ae6
Merge pull request #207738 from Mic92/nix-index 
nixos/nix-index: add module
 2022-12-27 10:39:05 +00:00
Gabriella Gonzalez
474198f808 darwin.builder: Fix gratuitous rebuilds 
See the discussion starting here:

https://github.com/NixOS/nixpkgs/pull/206951#issuecomment-1364760917

The `darwin.builder` derivation had a gratuitous dependency
on the current Nixpkgs revision due to
`config.system.nixos.revision`.  Setting the revision explicitly
to null fixes this problem and prevents the derivation from being
rebuilt on every change to Nixpkgs.
 2022-12-26 20:25:56 -06:00
R. Ryantm
0fe0ee997f pipewire: 0.3.63 -> 0.3.63 2022-12-27 01:04:17 +00:00
Sandro
9bc0aeb745
nixos/uptime-kuma: fix link 2022-12-26 21:52:30 +01:00
Kevin Cox
487b51e77c
nixos/nginx: Deduplicate modules. 
In most places in NixOS defining an option multiple places just merges the result together. This is particularly useful if you have two modules that both need an option, you don't want to have problems when they both set it. This makes the nginx `additionalModules` option follow this pattern.
 2022-12-26 15:47:51 -05:00
Ryan Lahfa
b2b06a2677
Merge pull request #207693 from tazjin/fix-public-inbox 
nixos/public-inbox: fix incorrectly restrictive option type
 2022-12-26 21:25:05 +01:00
Michal Sojka
3708ee280b nixos/nix-daemon: fix typo 2022-12-26 20:45:13 +01:00
Masanori Ogino
93224c214e nixos/iay: add module; iay: add myself as a maintainer 
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
 2022-12-27 03:06:29 +09:00
K900
2d3cf010fe
Revert "treewide: use nativeBuildInputs with runCommand instead of inlining" 2022-12-26 21:05:35 +03:00
Linus Heckemann
b36e8f733d plasma5: allow pipewire-pulse instead of pulseaudio for mobile 2022-12-26 17:54:12 +01:00
Alexander Bakker
89f4a5ab26 libvirtd: add parallelShutdown option 
This adds a new ``parallelShutdown`` option that allows users to control
how many guests can be shut down concurrently. Allowing multiple virtual
machines to be shut down at the same time reduces the amount of time it
takes to reboot the host.

Upstream documentation: https://www.libvirt.org/manpages/libvirt-guests.html#files
 2022-12-26 17:34:02 +01:00
Matt Melling
b6d94e3962 nixos/xastir: init 2022-12-26 10:33:49 -06:00
Lily Foster
8b4fd74782 nixos/filesystems: require fstab options list be non-empty 
When the option list is empty, the fstab generator does not
automatically add "defaults" and generates a non-working fstab (since it
just emits two spaces around where the options would have been which is
only technically one fstab separator).
 2022-12-26 17:11:05 +01:00
Naïm Favier
dc1e00bd8b
nixos/wg-quick: use networking.firewall.package 
Use `nftables` if available.
 2022-12-26 10:28:03 +01:00
figsoda
6175aaa7d2
Merge pull request #207777 from lilyinstarlight/fix/nix-daemon-coercible 
nixos/nix-daemon: fix isCoercibleToString typo
 2022-12-25 21:40:08 -05:00
netali
64a957a7d1
nixos/powerdns: add secretFile option 2022-12-26 02:12:31 +01:00
Maciej Krüger
94373a589b
Merge pull request #203011 from duament/firewall-nftables 2022-12-26 00:57:24 +01:00
Leona Maroni
2d7b8ef56f
nixos/paperless: update for paperless-ngx 1.10.2 2022-12-25 23:07:44 +00:00
Jörg Thalheim
f896f689ed nixos/nix-index: add module 2022-12-25 22:53:26 +01:00
Sandro
5af3f865e8
Merge pull request #206775 from SuperSandro2000/runCommand-nativeBuildInputs 2022-12-25 21:42:05 +01:00
Sandro
8e7c15dc63
Merge pull request #205648 from SuperSandro2000/hardware-opengl 2022-12-25 21:38:10 +01:00
Sandro Jäckel
c5551f19e5
nixos/no-x-libs: add mpv-unwrapped 2022-12-25 20:36:48 +01:00
Sandro Jäckel
78c276f9b1
nixos/no-x-libs: add gst_all_1.gst-plugins-base, turn gstreamer back on for libextractor 2022-12-25 20:10:39 +01:00
Sandro
682e55d80d
Merge pull request #207388 from SuperSandro2000/nixos/dex 2022-12-25 19:41:48 +01:00
github-actions[bot]
583c7499e5
Merge staging-next into staging 2022-12-25 18:01:38 +00:00
Vincent Ambo
aea521150d nixos/public-inbox: fix incorrectly restrictive option type 
The `freeformType` of `settings.publicinbox` in this module prevented
users from setting settings on the `publicinbox` section itself (which
is necessary for making e.g. IMAP work correctly), and only allowed
configuration of nested per-inbox sections.

In general I believe that these overly specific types which are
traditional in NixOS, and this kind of config generation, are a huge
footgun. This commit is the least invasive change that makes the
module work correctly.
 2022-12-25 16:45:58 +03:00
Andrew Childs
4ec86b13c9
pleroma: 2.4.4 -> 2.5.0 (#207521) 2022-12-25 13:38:55 +01:00
github-actions[bot]
b48679133a
Merge staging-next into staging 2022-12-25 12:01:40 +00:00
Bjørn Forsman
700adb32e9 nixos/sane: point SANE_CONFIG_DIR away from /etc/sane.d 
This brings back the ability to e.g. configure sane-airscan with
`environment.etc."sane.d/airscan.conf".text = ...`.

(AFAICT, sane-airscan loads all config files it finds, so it'll first
load the one from the nixos hardware.sane.* configuration, then the user
specified one in /etc/sane.d/airscan.conf.)

Fixes: 4fbec87a5b ("nixos/sane: point env vars to /etc for quick reload")

Fixes https://github.com/NixOS/nixpkgs/issues/207262
 2022-12-25 12:34:50 +01:00
Phosu Parsons
ff9dbe90d7 services.pixiecore: add quick option 2022-12-25 09:33:38 +01:00
Will Fancher
9a497aab1b systemd-stage-1: Improve test-instrumentation output 2022-12-24 19:36:29 -05:00
Jan Tojnar
72c37eddec Merge branch 'staging-next' into staging 2022-12-25 01:30:47 +01:00
Will Fancher
a45968c1e4 nixos/zfs: Ensure pool has datasets to decrypt 2022-12-24 17:13:32 -05:00
Lily Foster
7def7250be
nixos/nix-daemon: fix isCoercibleToString typo 
It isn't exported at the top-level lib and needs to be qualified.
 2022-12-24 13:34:06 -05:00
Robert Hensing
4a6d66b322
Merge pull request #207577 from Gabriella439/gabriella/fix_macos-builder_script 
darwin.builder: Fix `system` for `install-credentials`
 2022-12-24 17:28:08 +01:00
Nathan Henrie
7e1a3e4a8f nixos/installer/cd-dvd/iso-image: Honor boot.loader.timeout for EFI 
EFI boot timeout is currently a static 10 whereas syslinux uses
boot.loader.timeout. This changes the EFI config to match.

Some discussion at https://discourse.nixos.org/t/how-to-override-let-variables/23741/2
 2022-12-24 09:27:43 -07:00
Guillaume Girol
8abfd56121
Merge pull request #207532 from Mic92/nginx-fix 
nixos/nginx: disable configuration validation for now
 2022-12-24 15:30:21 +00:00
Sandro
c8c8ac5cc6
Merge pull request #203449 from yaxitech/azure-quote-provider 2022-12-24 16:19:39 +01:00
Gabriella Gonzalez
799491feba darwin.builder: Fix system for install-credentials 
The script was being mistakenly being built for the guest
system instead of the host system
 2022-12-24 08:47:59 -06:00
Felix Buehler
6617511200 nixos/podman: add autoPrune option 2022-12-24 12:01:16 +01:00
Maximilian Bosch
5dfbae068f
Merge pull request #206878 from SebTM/fix/greetd_sds_type 
greetd: Fix systemd-output in greetd/tuigreed
 2022-12-24 11:11:27 +01:00
Jörg Thalheim
7ef58bce9d nixos/nginx: disable configuration validation for now 
There still seem a lot of breakages not addressed yet:

https://github.com/NixOS/nixpkgs/pull/205561
 2022-12-24 09:25:43 +01:00
Sandro
9572cd9622
Merge pull request #207159 from SuperSandro2000/nox-sdr 2022-12-24 02:06:36 +01:00
Sandro Jäckel
a3f2e4a256
nixos/no-x-libs: add gpsd and limesuite 2022-12-24 01:49:24 +01:00
Gabriella Gonzalez
0b9b09eee6 darwin.builder: Fix supported platforms 
See: https://github.com/NixOS/nixpkgs/issues/108984#issuecomment-1364263324

Before this change the supported platforms were unspecified, so
it would default to being only built on `x86_64-linux`.  This
fixes that so that hydra.nixos.org builds and caches the Darwin
build products instead
 2022-12-23 13:38:34 -06:00
Izorkin
37bea1a089
nixos/peertube: add SyslogIdentifier 2022-12-23 20:47:05 +03:00
Izorkin
ff099060ed
nixos/peertube: fix typo 2022-12-23 20:47:05 +03:00
Izorkin
9195f02b49
nixos/peertube: add secretsFile option 2022-12-23 20:47:04 +03:00
Izorkin
32673128e5
nixos/peertube: update nginx configuration 2022-12-23 20:47:04 +03:00
Izorkin
1915c85b9e
peertube: 4.3.1 -> 5.0.0 2022-12-23 20:46:54 +03:00
Naïm Favier
eb13e0bb84
Merge pull request #207342 from SuperSandro2000/nitter 2022-12-23 17:20:26 +01:00
Ryan Lahfa
bba92d35cb
Merge pull request #207399 from ju1m/mosquitto 
nixos/mosquitto: fix duplicate module loading
 2022-12-23 17:07:12 +01:00
Kristoffer Dalby
571780384a
headscale: Update to 0.17.1, conform module to RFC0042 
This commit upgrades headscale to the newest version, 0.17.0 and updates
the module with the current breaking config changes.

In addition, the module is rewritten to conform with RFC0042 to try to
prevent some drift between the module and the upstream.

A new maintainer, Misterio77, is added as maintainer.

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
Co-authored-by: Gabriel Fontes <hi@m7.rs>
Co-authored-by: Geoffrey Huntley <ghuntley@ghuntley.com>
 2022-12-23 15:47:53 +01:00
Florian Klink
6b1a896570
Merge pull request #205121 from alaviss/homed 
nixos: systemd-homed support
 2022-12-23 13:09:17 +01:00
Julien Moutinho
9ebacfec17 nixos/mosquitto: fix duplicate module loading 2022-12-23 10:43:55 +01:00
Bobby Rong
d7e2c900d7
Merge pull request #206847 from bobby285271/cinnamon-nemo-extensions 
cinnamon.nemo-with-extensions: init
 2022-12-23 17:09:55 +08:00
Sandro Jäckel
32b35888d6
nixos/dex: fix ssl cert validation 2022-12-23 06:39:26 +01:00
Samuel Dionne-Riel
d91e1f98fa nixos: Add sd_image_minimal_new_kernel_no_zfs 
Support for ZFS, while desirable, is problematic with newer kernel
releases. The stable ZFS release seldom supports the current newest
kernel version, and this makes the new_kernel image basically useless as
it cannot be published, and is not often built with new kernel releases.

This uses a dirty workaround to work around the fact it is impossible to
remove a list item from a modules system list type. Since ZFS support is
conditional to being supported on the current platform, we can fake ZFS
not being supported *for the no-zfs build only*. This overlay is only
added when evaluating the image, nothing else.
 2022-12-22 23:07:19 -05:00
Samuel Dionne-Riel
35bb28b367 nixos: Add iso_minimal_new_kernel_no_zfs 
Support for ZFS, while desirable, is problematic with newer kernel
releases. The stable ZFS release seldom supports the current newest
kernel version, and this makes the new_kernel iso basically useless as
it cannot be published, and is not often built with new kernel releases.

This uses a dirty workaround to work around the fact it is impossible to
remove a list item from a modules system list type. Since ZFS support is
conditional to being supported on the current platform, we can fake ZFS
not being supported *for the no-zfs build only*. This overlay is only
added when evaluating the iso, nothing else.
 2022-12-22 23:00:14 -05:00
figsoda
522bf206fd
Merge pull request #207063 from figsoda/gitconfig 
nixos/git: allow lists for config to keep things in order
 2022-12-22 22:00:12 -05:00
Ryan Lahfa
e2e8dfcf44
Merge pull request #207163 from NixOS/rfc0125-improvements 
nixos/activation/bootspec: make initrd optional, serialize system, precise extensions' type
 2022-12-23 00:43:29 +01:00
Sandro
2f9691a8af
nixos/nitter: fix enable option description 
Whether to enable If enabled, start Nitter.. -> Whether to enable Nitter.
 2022-12-23 00:11:49 +01:00
Nathan Henrie
3930bcb3c3 Make syslinuxTimeout match documentation 
- https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout
- cbe419ed4c/nixos/modules/system/boot/loader/loader.nix (L16)

Fixes https://github.com/NixOS/nixpkgs/issues/207289
 2022-12-22 13:25:14 -06:00
Rvfg
a43c7b2a70
nixos/{firewall, nat}: add a nftables based implementation 2022-12-23 00:49:24 +08:00
Cole Helbling
21f4afd799 nixos/activation/bootspec: fix document output path 
The RFC currently stipulates the document will be available at
`$out/boot.json`.
 2022-12-22 07:56:09 -08:00
Bobby Rong
ce96f00944
Merge pull request #205417 from kurnevsky/tox-node-0.2.0 
tox-node: 0.1.1 -> 0.2.0
 2022-12-22 23:30:51 +08:00
Sandro
574ff7d8b8
Merge pull request #207138 from SuperSandro2000/statsd-module 2022-12-22 03:20:15 +01:00
Naïm Favier
f677cbabe9
nixos/tests: remove minimal-kernel module 
It's not used, doesn't build, and seems like the only reason to have
`manualConfig` take `stdenv` as an argument.
 2022-12-22 01:42:15 +01:00
Ryan Lahfa
b3af9ee9ea
Merge pull request #205765 from NixOS/fix-dolibarr-for-non-nginx 
nixos/services/dolibarr: decouple nginx and let other web servers be used
 2022-12-22 01:13:48 +01:00
Ryan Lahfa
a10069fd24
Merge pull request #203524 from jakubgs/zfs/no-force-import-hibernate 
nixos/zfs: assert no force import with hibernation
 2022-12-22 01:12:38 +01:00
Ryan Lahfa
5431f7ccb2
Merge pull request #205578 from dev-null-undefined/i3lock-yubikey 
nixos/i3lock: i3lock program with u2fSupport option
 2022-12-22 01:04:05 +01:00
Raito Bezarius
5dd2e60371 nixos/activation/bootspec: make initrd optional, serialize system, precise extensions' type 2022-12-21 23:28:21 +01:00
Michele Guerini Rocco
5dff7733aa
Merge pull request #203454 from rnhmjoj/pr-cups-socket 
nixos/hardware/printers: stop cupsd when unneeded
 2022-12-21 23:06:00 +01:00
Evgeny Kurnevsky
d7b2de44c3
tox-node: 0.1.1 -> 0.2.0 2022-12-22 00:38:16 +03:00
Sandro
5b450caa5e
Merge pull request #202245 from tylerjl/rpcbind-tmpfiles-dependency 2022-12-21 20:35:50 +01:00
Sandro Jäckel
8a81ad8fda
nixos/statsd: add missing module import 2022-12-21 20:15:58 +01:00
Naïm Favier
3a8fd0ef47
nixos/installation-cd-minimal: disable noXlibs 
Causes a lot of uncached builds for a negligible decrease in size (822 →
821 MiB currently).
 2022-12-21 15:19:37 +01:00
Domen Kožar
bcc8d11f01
Merge pull request #206951 from MercuryTechnologies/gabriella/macos-builder 
darwin.builder: init
 2022-12-21 12:20:12 +00:00
pennae
4cdcad6b26 nixos/firefox-syncserver: remove unnecessary service option 
Stderr does not exist as a systemd option (StandardError would've been
correct), but since "journal" is the default by association this mistake
never had any effect. just remove the key entirely.
 2022-12-21 10:29:25 +01:00
pennae
13d725908c syncstorage-rs: 0.12.5 -> 0.13.1 
this includes a module update because the package update breaks the
module. would rather not break system bisection if possible.
 2022-12-21 10:29:25 +01:00
Thomas Tuegel
cc620a6e59
Merge pull request #203863 from samueldr/fix/plamo-misc-issues 
Plasma Mobile: Minor fixes
 2022-12-20 22:43:21 -06:00
figsoda
a0a6d4da33 nixos/git: allow lists for config to keep things in order 2022-12-20 21:54:36 -05:00
Maximilian Bosch
f37f1de422
Merge pull request #204537 from squalus/grafana-role 
nixos/grafana: add Admin to valid auto_assign_org_role values
 2022-12-20 21:14:47 +01:00
Thomas Watson
af25692214 nixos/stage-1: Examine binaries for libraries in a consistent order 
To reduce size, stage 1 (the initrd) is populated by copying specific
binaries in, then copying the libraries specifically needed by those
binaries. `patchelf` is then used to make the binaries search in the
directory where these libraries are copied to instead of their original
store paths.

Some filesystems (e.g. ZFS) do not guarantee that copying the same files
in the same order into a given directory will result in `find` returning
them in any particular order (though the order appears consistent so
long as the directory is not modified).

Therefore, when the binaries are scanned for libraries to copy in, they
might be scanned in a different order each time the derivation is built.
If two binaries need two different libraries with the same name, then a
different instance of the library might be copied in first, changing the
derivation contents and breaking reproducibility.

This turns out to be the case with `libudev.so.1` from both `systemd`
(needed by e.g. `mdadm`) and `systemdMinimal` (needed by e.g.
`dmsetup`). This issue is fixed by sorting the list of binaries to be
scanned instead of relying on filesystem order so that the same instance
always gets seen and copied first.

Both before this change (at least on ext4) and after this change
(without any options that affect stage 1), this is the `libudev.so.1`
from `systemdMinimal` by way of `dmsetup`. Whether this is appropriate
and how much the two different systemd configurations and udev libraries
need to be involved is a topic left for future work.
 2022-12-20 08:24:19 +01:00
Bobby Rong
5b8e77a308
nixos/cinnamon: install nemo-with-extensions 2022-12-20 10:59:37 +08:00
Tavi
705392e011 nixos/services.tinc: Fix whitespace 
Fix indentation for previous commit
 2022-12-19 21:19:02 -05:00
Tavi
ca591e7008 nixos/services.tinc: Add all generated /etc/ files to reloadTriggers 
Bug fix for issue #66431. Adds all files created as a result of
hostSettings configuration to the created service's reloadTriggers,
or to restartTriggers if the version of tinc isn't 1.1pre or later.
 2022-12-19 20:35:00 -05:00
Gabriella Gonzalez
edd1cbf5d4 darwin.builder: init 
Fixes https://github.com/NixOS/nixpkgs/issues/108984

This originates from:

https://github.com/Gabriella439/macos-builder

… which in turn originates from:

https://github.com/YorikSar/nixos-vm-on-macos
 2022-12-19 17:03:45 -08:00
Sandro
bf46d7b626
Merge pull request #172084 from priegger/prometheus-statsd-exporter 2022-12-19 23:16:02 +01:00
Olaf Tomalka
813a0ef809 lighthouse: fix validator service not setting arguments properly 2022-12-19 16:41:43 -05:00
Sandro
ac210fc15c
Merge pull request #206441 from SuperSandro2000/msmtp 2022-12-19 22:28:07 +01:00
Sandro
ace7950a79
Merge pull request #206454 from SuperSandro2000/libextractor 2022-12-19 22:27:31 +01:00
Guillaume Girol
92dbac3199
Merge pull request #205561 from symphorien/nginx-conf-validate 
nixos/nginx: validate config at build time
 2022-12-19 19:52:33 +00:00
github-actions[bot]
141c0ed100
Merge staging-next into staging 2022-12-19 18:01:41 +00:00
Sebastian Sellmeier
d3c6ea9d46
greetd: use service-type 'idle' in systemd-service to avoid overlapping systemd-output 2022-12-19 18:22:16 +01:00
Jörg Thalheim
9bf4ec6909
Merge pull request #206645 from Mic92/nix-ld 
nixos/nix-ld: set NIX_LD by default
 2022-12-19 16:26:02 +00:00
Jörg Thalheim
4ce47012a6 nixos/nix-ld: set NIX_LD by default 2022-12-19 17:06:41 +01:00
Artturi
1c387ed1a6
Merge pull request #206709 from SuperSandro2000/mandb-misc 
nixos/man-db: use nativeBuildInputs
 2022-12-19 17:55:46 +02:00
Jonas Heinrich
a9e3b1c0f2 nixos/usbmuxd: Ability to change package 2022-12-19 08:14:07 -05:00
github-actions[bot]
c45ee202ae
Merge staging-next into staging 2022-12-19 12:02:11 +00:00
Franz Pletz
6f8f1b0454
Merge pull request #205865 from DeeUnderscore/fix/grafana-socket 2022-12-19 12:04:22 +01:00
github-actions[bot]
dc1fa2c776
Merge staging-next into staging 2022-12-19 00:02:57 +00:00
Sandro Jäckel
26f704b545
treewide: use nativeBuildInputs with runCommand instead of inlining 2022-12-18 23:36:40 +01:00
Anderson Torres
c7499150c2
Merge pull request #206698 from linsui/firefox 
nixos/firefox: add languagePacks config
 2022-12-18 19:01:45 -03:00
dev-null-undefined
1cd6b0681e
nixos/i3lock: i3lock program with u2fSupport option 
i3lock program with option to enable u2fAuth.
 2022-12-18 21:31:06 +01:00
github-actions[bot]
dc7ebb0163
Merge staging-next into staging 2022-12-18 18:01:41 +00:00
Valentin Gagarin
f782da699e
Merge pull request #206646 from figsoda/typos 2022-12-18 18:27:57 +01:00
figsoda
d48c2fd1ca
nixos/pgpkeyserver-lite: fix typo 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2022-12-18 11:35:23 -05:00
Sandro Jäckel
a6fa6abb15
nixos/man-db: use nativeBuildInputs 2022-12-18 14:19:36 +01:00
linsui
8153ba84ca nixos/firefox: add languagePacks config 2022-12-18 20:48:49 +08:00
Vincent Bernat
fc39b5ecc8 nginx: make global redirect vhost option accept exceptions 
By moving the return into a location directive, one can provide
exceptions by adding locations. This is similar to what the forceSSL
option does.
 2022-12-18 12:21:27 +01:00
figsoda
6bb0dbf91f nixos: fix typos 2022-12-17 19:31:14 -05:00
Raito Bezarius
b19612cb24 nixos/services/dolibarr: decouple nginx and let other web servers be used 2022-12-18 01:05:53 +01:00
github-actions[bot]
7984a7dacb
Merge staging-next into staging 2022-12-18 00:05:50 +00:00
Robert Hensing
cf150c53f1
Merge pull request #200724 from JonathanLorimer/allow-configuration-of-roles 
services.postgresql: Allow configuration of user roles in ensureUser
 2022-12-18 00:40:57 +01:00
github-actions[bot]
887e342eaa
Merge staging-next into staging 2022-12-17 18:01:35 +00:00
Julien Moutinho
15046139d5 nixos/mmsd: init 2022-12-17 17:36:43 +01:00
Naïm Favier
723eb8d9b8
Merge pull request #205479 from IzumiRaine/borgbackup-patterns 2022-12-17 17:00:02 +01:00
Ryan Lahfa
af6ea430f4
Merge pull request #201119 from Enzime/remove-tailscale-warning 
nixos/tailscale: Add `useRoutingFeatures` option
 2022-12-17 15:44:07 +01:00
Jakub Sokołowski
c70f047315
nixos/zfs: assert no force import with hibernation 
According to a ZFS issue about hibernation causing data corruption:
https://github.com/openzfs/zfs/issues/12842

The way this happens is if the system force imports a pool that was
suspended during hibernation. I've had this happen twice on NixOS and
I'd like to avoid having this happen again, to me or others.

To do this I've added an assertion that makes sure you can't have
`forceImportRoot` or `forceImportAll` enabled with `allowHibernation`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
 2022-12-17 13:11:23 +01:00
github-actions[bot]
392cc9b8fe
Merge staging-next into staging 2022-12-17 12:01:41 +00:00
Michael Hoang
68e514ed1c nixos/tailscale: Add useRoutingFeatures option 2022-12-17 22:38:14 +11:00
Vladimír Čunát
0ba3487fc6
Merge #205270: staging-next 2022-12-09 2022-12-17 10:11:16 +01:00
Jörg Thalheim
668a2b2f33
Merge pull request #172237 from DeterminateSystems/bootspec-rfc 
Support external bootloader backends (RFC-0125)
 2022-12-17 08:35:53 +00:00
github-actions[bot]
4804305f6e
Merge staging-next into staging 2022-12-17 06:02:03 +00:00
github-actions[bot]
05ca3d8285
Merge master into staging-next 2022-12-17 06:01:30 +00:00
AndersonTorres
4a194173b0 nixos/katriawm: add module 2022-12-17 00:13:39 -03:00
AndersonTorres
4ee04d0f1a module-list: put in ascii-betical ordering 2022-12-17 00:13:38 -03:00
laalsaas
3546fca5a4 plasma5: add notoPackage option 
Some users don't want all >190 Noto fonts.
 2022-12-17 01:17:17 +01:00
github-actions[bot]
61a0176830
Merge staging-next into staging 2022-12-17 00:02:50 +00:00
github-actions[bot]
30b97b0e83
Merge master into staging-next 2022-12-17 00:02:17 +00:00
Sandro
d154d50e2c
Merge pull request #200856 from aacebedo/aacebedo/streamdeck-ui_package_option 2022-12-17 00:46:28 +01:00
Ryan Lahfa
4428f9f5e9
Merge pull request #198239 from jacobgreenleaf/jacobg-borg-inhibit 
nixos/borgbackup: Add option for inhibiting sleep
 2022-12-17 00:45:10 +01:00
Ryan Lahfa
810e9ccfda
Merge pull request #200720 from kaldonir/dynamic-motd 
pam: Allow backing the MOTD with a file
 2022-12-17 00:35:08 +01:00
Sandro
c338bf3244
Merge pull request #205712 from devusb/atuin-server 2022-12-16 22:38:35 +01:00
Sandro Jäckel
c01a28d021
nixos/no-x-libs: add libextractor 2022-12-16 22:06:00 +01:00
Vladimír Čunát
5bfe30aafa
Merge branch 'master' into staging-next 2022-12-16 21:58:10 +01:00
Sandro Jäckel
debcf570c6
nixos/no-x-libs: add msmtp 2022-12-16 20:16:10 +01:00
Nikolay Korotkiy
4e2ce56d6f
Merge pull request #206419 from peperunas/miniflux-package 
miniflux: Add package option
 2022-12-16 23:11:12 +04:00
github-actions[bot]
f61e6f8d8e
Merge staging-next into staging 2022-12-16 18:02:14 +00:00
github-actions[bot]
ac36665726
Merge master into staging-next 2022-12-16 18:01:38 +00:00
Bernardo Meurer
bf4294b338
Merge pull request #203872 from mikepii/roon-server-id-dir 2022-12-16 14:37:06 -03:00
Frank Moda
e27e857def nixos/cloudflared: guard config with enable flag 2022-12-16 11:30:44 -05:00
Giulio De Pasquale
b2742248e8
miniflux: Add package option 2022-12-16 16:11:40 +01:00
Izorkin
8e14bf10c2
nixos/mastodon: update database configuration 2022-12-16 16:19:39 +03:00
Izorkin
e2cebf2134
nixos/mastodon: fix init db on remote postgresql 2022-12-16 16:14:39 +03:00
Vladimír Čunát
59a68f487d
Merge branch 'staging-next' into staging 2022-12-16 11:20:50 +01:00
Vladimír Čunát
e6cd929c5e
Merge branch 'master' into staging-next 2022-12-16 11:09:31 +01:00
Morgan Helton
a935888d45 nixos/atuin: init module 2022-12-15 21:07:15 -06:00
happysalada
60797a3bfe surrealdb: add package option 2022-12-15 19:52:28 -05:00
github-actions[bot]
b9ac6ee4d9
Merge master into staging-next 2022-12-16 00:02:17 +00:00
Sandro
78d53eadca
Merge pull request #201985 from Shawn8901/prometheus_web_config 2022-12-15 23:18:55 +01:00
Artturin
05a2dfd674 lib.replaceChars: warn about being a deprecated alias 
replaceStrings has been in nix since 2015(nix 1.10)

so it is safe to remove the fallback

d6d5885c15
 2022-12-15 22:25:51 +02:00
Markus Napierkowski
192ae663cc nixos/pam: allow backing the motd with a file 2022-12-15 11:54:26 +01:00
Shawn8901
6e530b9eda prometheus: Adds an option for web.config.file which can specity settings including authorization. 2022-12-15 10:14:42 +01:00
Shawn8901
470247d433 prometheus: Use yaml format generator instaed json for prometheus.yml 
Additionally remove an unused variable
 2022-12-15 10:11:25 +01:00
github-actions[bot]
9e23ec4f1c
Merge staging-next into staging 2022-12-15 00:03:02 +00:00
github-actions[bot]
58a71457f7
Merge master into staging-next 2022-12-15 00:02:26 +00:00
Sandro
b5f35b1c85
Merge pull request #205399 from SuperSandro2000/fix-avahi 2022-12-14 23:34:12 +01:00
Florian Klink
03cf14a56f
Merge pull request #206042 from flokli/assertion-hsphfpd-wireplumber 
nixos/wireplumber: assert hsphfpd to be disabled
 2022-12-14 22:02:12 +00:00
Jörg Thalheim
92b32a8a7c
Merge pull request #205895 from jakubgs/transmission/add-package-opt 
transmission: add package option
 2022-12-14 21:55:08 +00:00
Jörg Thalheim
77f3936552
Merge pull request #205927 from asininemonkey/nixos-nvme-cli 
nixos/modules/profiles/base: add nvme-cli
 2022-12-14 21:40:46 +00:00
Florian Klink
bfc60c9362 nixos/wireplumber: assert hsphfpd to be disabled 
According to
https://github.com/NixOS/nixpkgs/issues/205957#issuecomment-1350158554,
pipewire/wireplumber already provides this functionality.

Fixes #205957
 2022-12-14 21:24:13 +00:00
github-actions[bot]
f9bd55aade
Merge staging-next into staging 2022-12-14 18:02:10 +00:00
github-actions[bot]
eb81abe9c0
Merge master into staging-next 2022-12-14 18:01:37 +00:00
Matt Melling
e2b79f08bd gpsd: add listenany option 2022-12-14 18:37:15 +01:00
Jörg Thalheim
7af2f0e2e7
Merge pull request #205943 from mweinelt/vaultwarden 
vaultwarden: Add update script to keep web vault in sync
 2022-12-14 16:15:49 +00:00
tv
816614bd62 nixos/exim: allow using service credentials 
By settings User= to the actual Exim user, systemd will ensure that the
credentials directory will have the correct ownership, allowing users to
utilize LoadCredential=.  Exim still gets started as root (and drops
privileges) to preserve the previous behavior.
 2022-12-14 16:43:46 +01:00
Martin Weinelt
0497d5b99f
vaultwarden: Add update script to keep web vault in sync 
- Adds an update script to fetch the compatible web vault version
- Removes `vaultwarden-vault` from top-level to prevent independent
  updates through e.g. r-ryantm. Istead the vault is now accessible
  at `vaultwarden.webvault`.
- The name webvault was chosen because it is the title of the projects
  README and it makes it clearer, that this is the web UI.
 2022-12-14 15:00:20 +01:00
Naïm Favier
bec17309fd
Merge pull request #206079 from ncfavier/vim-fix-example 2022-12-14 14:38:42 +01:00
Naïm Favier
7bb8a42095
nixos/vim: fix example package 
vimHugeX is now an alias for vim-full
 2022-12-14 14:25:30 +01:00
github-actions[bot]
722750c19c
Merge staging-next into staging 2022-12-14 12:01:53 +00:00