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
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
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
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
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
Joe DeVivo
bf92d0ec37
nixos/ssm-agent: conf files written to /etc
...
ssm-agent expects files in /etc/amazon/ssm. The pkg substitutes a location in
the nix store for those default files, but if we ever want to adjust this
configuration on NixOS, we'd need the ability to modify that file.
This change to the nixos module writes copies of the default files from the nix
store to /etc/amazon/ssm. Future versions can add config, but right now this
would allow users to at least write out a text value to
environment.etc."amazon/ssm/amazon-ssm-agent.json".text to provide
their own config.
2021-05-10 13:16:41 -07:00
github-actions[bot]
61fa3fdde8
Merge master into staging-next
2021-05-10 18:28:17 +00:00
Sandro
f0bb4f066a
Merge pull request #95050 from paumr/bind-fmt
2021-05-10 19:06:00 +02:00
github-actions[bot]
115881e756
Merge master into staging-next
2021-05-10 12:24:32 +00:00
Izorkin
85914bc01d
nixos/netdata: change wrappers permissions
2021-05-10 10:35:51 +03:00
Izorkin
859633ee43
nixos/netdata: use cgroup v2
2021-05-10 10:24:31 +03:00
Izorkin
58497175be
nixos/netdata: cgroup-network: don't use AmbientCapabilities
2021-05-10 10:19:57 +03:00
Michele Guerini Rocco
4cbe186a8a
Merge pull request #121394 from bjornfor/atd-file-creation
...
nixos/atd: prefer 'install' over 'mkdir/chmod/chown'
2021-05-10 08:43:57 +02:00
github-actions[bot]
f4d69ad1f2
Merge master into staging-next
2021-05-10 06:20:28 +00:00
Michele Guerini Rocco
d0cbcce8d4
Merge pull request #121395 from bjornfor/nixos-wpa-supplicant
...
nixos/wpa_supplicant: prefer 'install' over 'touch/chmod/mkdir/chgrp'
2021-05-10 08:16:39 +02:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
...
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
paumr
5390d4b946
nixos/bind: formatted with nixpkgs-fmt
2021-05-08 23:13:58 +02:00
Robert Hensing
4433ba90aa
Merge pull request #121927 from rissson/nixos-unbound-fix-top-level-include
...
nixos/unbound: allow list of strings in top-level settings option type
2021-05-08 22:00:57 +02:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next
2021-05-08 18:22:46 +00:00
Marc 'risson' Schmitt
0340cd2abe
nixos/unbound: allow list of strings in top-level settings option type
...
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
2021-05-08 19:55:17 +02:00
Aaron Andersen
9254b82706
Merge pull request #121746 from j0hax/monero-options
...
nixos/monero: add dataDir option
2021-05-08 11:43:49 -04:00
Martin Weinelt
9651084620
Merge remote-tracking branch 'origin/master' into staging-next
2021-05-08 14:43:43 +02:00
Vladimír Čunát
080cd658ca
Merge #121780 : treewide meta.maintainers tweaks
2021-05-08 10:47:08 +02:00
Gemini Lasswell
28f51d7757
nixos/yggdrasil: set directory permissions before writing keys
...
Remove the opportunity for someone to read the keys in between when
they are written and when the chmod is done. Addresses #121293 .
2021-05-08 09:49:19 +02:00
Jan Tojnar
468cb5980b
gnome: rename from gnome3
...
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
github-actions[bot]
b4416b52c5
Merge master into staging-next
2021-05-08 00:46:50 +00:00
Johannes Arnold
c0853b6e2c
nixos/monero: use isSystemUser = true
2021-05-08 02:13:25 +02:00
Michele Guerini Rocco
4e4869b92b
Merge pull request #114745 from rnhmjoj/brltty
...
brltty: 6.1 -> 6.3; nixos/brltty: use upstream units
2021-05-07 23:35:57 +02:00
Evils
5ae90276c3
nixos/fancontrol: clean up module
...
set a group and user for the service
remove default null config
it's required, now it throws an error pointing to the option
set myself (module author) as maintainer
2021-05-07 11:46:40 -07:00
github-actions[bot]
1ae6d3d02f
Merge master into staging-next
2021-05-07 18:24:29 +00:00
ajs124
cd609e7a1c
Merge pull request #117094 from helsinki-systems/drop/spidermonkey_1_8_5
...
spidermonkey_1_8_5: drop
2021-05-07 18:55:49 +02:00
Robert Hensing
316b82563a
Merge pull request #121702 from hercules-ci/nixos-hercules-ci-agent-update
...
nixos/hercules-ci-agent: updates
2021-05-07 15:48:33 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
...
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
github-actions[bot]
12193913a1
Merge staging-next into staging
2021-05-07 12:23:21 +00:00
Jan Tojnar
9468b07326
Merge branch 'gnome-40'
2021-05-07 12:12:40 +02:00
github-actions[bot]
e5f4def056
Merge staging-next into staging
2021-05-07 00:46:58 +00:00
John Ericson
a3e54cb582
Merge remote-tracking branch 'upstream/staging-next' into staging
2021-05-06 15:48:25 -04:00
Sander van der Burg
77295e7e6b
nixos/disnix: configure the remote client by default, if multi-user mode has been enabled
2021-05-06 19:33:02 +02:00
Martin Weinelt
6a09bc4405
Merge pull request #121865 from mweinelt/home-assistant
2021-05-06 18:05:00 +02:00
