Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Florian Klink
6c0058f47f
Merge pull request #85073 from hyperfekt/systemd-pstore
...
nixos/systemd|filesystems: mount and evacuate /sys/fs/pstore using systemd-pstore
2021-05-17 00:00:52 +02:00
Aaron Andersen
21f5dd5c6e
Merge pull request #122647 from onny/caddy
...
nixos/caddy: support user and group options
2021-05-16 17:23:57 -04:00
Johan Thomsen
7e310dd8e8
nixos/containerd: StartLimit* options must be in the unit-section
...
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
2021-05-17 06:17:18 +10:00
Johan Thomsen
2142f88526
nixos/containerd: sanitize StateDirectory and RuntimeDirectory
2021-05-17 06:17:18 +10:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next
2021-05-16 01:00:58 +00:00
Michael Weiss
a542827c9b
nixos/sway: Update the module documentation
...
Most programs already run natively under Wayland so extraSessionCommands
isn't as important anymore. XWayland is already covered by
"programs.xwayland.enable = mkDefault true;" in the module.
2021-05-15 20:30:53 +02:00
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next
2021-05-15 18:30:28 +00:00
Michael Weiss
73e0dd4b29
Merge pull request #123034 from primeos/sway-simplify-screen-sharing
...
sway: Simplify screen sharing
2021-05-15 18:38:52 +02:00
Jonathan Ringer
5a6540c49c
nixos/factorio: update admin setting
2021-05-15 09:04:35 -07:00
Jonas Heinrich
fff9cf00fd
caddy: support user and group options
2021-05-15 10:32:49 +02:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging
2021-05-15 06:22:25 +00:00
github-actions[bot]
c48794dcef
Merge master into staging-next
2021-05-15 06:22:22 +00:00
Aaron Andersen
fc63be7ac8
Merge pull request #122658 from aanderse/httpd-reload
...
nixos/httpd: provide a stable path stable path to the configuration f…
2021-05-14 23:50:43 -04:00
Michael Weiss
3f31c0edef
sway: Simplify screen sharing
...
This should make it easier to get started.
The xdg-desktop-portal backend for wlroots is required and one needs to
"make sure WAYLAND_DISPLAY and XDG_CURRENT_DESKTOP are imported into
D-Bus." [0]
[0]: efcbcb60aa/README.md (running)
2021-05-14 22:42:19 +02:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next
2021-05-14 22:27:34 +02:00
Robert Schütz
e611d663f4
Merge pull request #120440 from dotlambda/radicale-settings
...
nixos/radicale: add settings option
2021-05-14 15:37:26 +02:00
WilliButz
94b2848559
Merge pull request #91663 from mweinelt/kea-exporter
...
prometheus-kea-exporter: init at 0.4.1
2021-05-14 14:38:08 +02:00
Eelco Dolstra
b08e223a04
nix: 2.3.10 -> 2.3.11
...
The patch is included in the new release, so can be dropped.
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2021-05-14 12:24:54 +00:00
Alyssa Ross
195d532a63
Revert "Revert "Revert "nix: 2.3.10 -> 2.3.11"""
...
This reverts commit 66fc303070
.
There is still a patch that doesn't apply.
2021-05-14 11:35:18 +00:00
Eelco Dolstra
66fc303070
Revert "Revert "nix: 2.3.10 -> 2.3.11""
...
This reverts commit 1872bbdae5
.
2021-05-14 13:33:05 +02:00
Alyssa Ross
1872bbdae5
Revert "nix: 2.3.10 -> 2.3.11"
...
This reverts commit 6f6b2cdc98
.
Version wasn't updated, and apparently a patch didn't apply. Let's do
this upgrade properly, in a PR, but for now I'm reverting so we don't
have a broken nix package in master.
2021-05-14 11:30:55 +00:00
Eelco Dolstra
6f6b2cdc98
nix: 2.3.10 -> 2.3.11
2021-05-14 13:11:26 +02:00
zowoq
004f8cd986
Merge staging-next into staging
2021-05-14 16:32:43 +10:00
github-actions[bot]
bf5d8bb531
Merge master into staging-next
2021-05-14 00:58:11 +00:00
Jan Tojnar
ac6a4f7cf5
Merge branch 'staging-next' into staging
2021-05-14 01:40:09 +02:00
Samuel Dionne-Riel
12ede41735
Merge pull request #110435 from superloach/patch-2
...
nixos/modules: add "sdhci_pci" to availableKernelModules
2021-05-13 17:45:22 -04:00
Jens Nolte
22e797947b
nixos/zfs: Add defaultText for 'boot.zfs.package'-option ( #122002 )
2021-05-13 17:40:10 -04:00
Maximilian Bosch
bfd4c121ff
Merge pull request #122637 from mayflower/prometheus-2.26.0
...
Prometheus 2.26.0 + exporter updates
2021-05-13 23:05:29 +02:00
Michael Weiss
60f2af5938
Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration
...
nixos/sway: Extend the default configuration for NixOS
2021-05-13 20:48:55 +02:00
github-actions[bot]
39e3f7c2cc
Merge master into staging-next
2021-05-13 18:32:50 +00:00
Luke Granger-Brown
ca6255bf0b
nixos/docker: fix evaluation when NAT is enabled too
...
Both networking.nat.enable and virtualisation.docker.enable now want to
make sure that the IP forwarding sysctl is enabled, but the module
system dislikes that both modules contain this option.
Realistically this should be refactored a bit, so that the Docker module
automatically enables the NAT module instead, but this is a more obvious
fix.
2021-05-13 10:26:45 +00:00
Martin Weinelt
bc4a80979b
nixos/prometheus-kea-exporter: init
2021-05-12 21:51:44 +02:00
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00:00
github-actions[bot]
f214722172
Merge master into staging-next
2021-05-12 18:32:26 +00:00
midchildan
6567031111
nixos/mirakurun: add polkit rule for smart card access ( #122066 )
...
Fixes #122039
2021-05-12 13:57:49 -04:00
Aaron Andersen
f20aa073e1
nixos/httpd: provide a stable path stable path to the configuration file for reloads
2021-05-11 22:36:55 -04:00
Robin Gloster
9438b12f99
prometheus-collectd-exporter: fix options for new version
2021-05-11 17:57:46 -05:00
Robin Gloster
b2956ce654
prometheus-bind-exporter: fix options for new version
2021-05-11 17:57:46 -05:00
Robin Gloster
da85657a6c
prometheus-rspamd-exporter: fix for new json exporter syntax
2021-05-11 17:57:46 -05:00
Thomas Tuegel
799f351997
KDE Applications 20.12.3 -> KDE Gear 21.04.0
2021-05-11 12:14:58 -05:00
Michael Weiss
00e8e5b123
nixos/sway: Extend the default configuration for NixOS
...
The default config.in template contains
"include @sysconfdir@/sway/config.d/*" but we've dropped it to better
support non-NixOS (which seems like a mistake in retrospect).
This restores that behaviour and extends the default configuration via
nixos.conf to fix #119445 .
Note: The security configurations (security.d) where dropped entirely
(but maybe they'll return).
2021-05-11 18:53:49 +02:00
github-actions[bot]
1e7a48b474
Merge master into staging-next
2021-05-11 12:24:28 +00:00
Tom
33a4c43126
nixos/tor: fix HidServAuth ( #122439 )
...
* add an example for services.tor.settings.HidServAuth
* fix HidServAuth validation to require ".onion"
Per https://manpages.debian.org/testing/tor/torrc.5.en.html :
> Valid onion addresses contain 16 characters in a-z2-7 plus ".onion"
2021-05-11 10:10:32 +02:00
github-actions[bot]
10e16ec9ab
Merge master into staging-next
2021-05-11 06:20:33 +00:00
Jörg Thalheim
8af4bf61fd
Merge pull request #122423 from Izorkin/update-netdata
...
nixos/netdata: update configuration
2021-05-11 06:07:48 +01:00
github-actions[bot]
49b8e6f7d4
Merge master into staging-next
2021-05-11 00:48:15 +00:00
Robert Schütz
7217b2d85e
Merge pull request #121785 from dotlambda/dendrite-rename
...
matrix-dendrite: rename to dendrite
2021-05-10 23:30:12 +02:00