Ryan Burns
40299257cc
Merge branch 'master' into staging-next
2021-09-23 18:43:00 -07:00
Kim Lindberger
3d3b1a7039
Merge pull request #138852 from ryantm/dev/ryantm/discourse-skip-create
...
nixos/discourse: add discourse.admin.skipCreate option
2021-09-23 19:09:59 +02:00
Michele Guerini Rocco
51bcdc4cda
Merge pull request #139026 from rnhmjoj/kube-fix
...
nixos/kubernetes: fix containerd settings
2021-09-23 17:35:13 +02:00
rnhmjoj
5ca89402ee
nixos/trafficserver: avoid input from derivation
...
Using builtins.readFile to load upstream defaults is a clever trick, but
it's not allowed in restricted evaluation mode: which means it fails on
Hydra, for example. Besides - in Nixpkgs - depending on derivation as
inputs is considered bad practice and should be avoided.
2021-09-23 12:52:31 +02:00
github-actions[bot]
796a5df129
Merge master into staging-next
2021-09-23 00:01:50 +00:00
rnhmjoj
6de529c64a
nixos/kubernetes: fix containerd settings
...
mkDefault must be applied to each setting individually, otherwise a
single change to `containerd.settings` replaces the whole attribute set.
2021-09-23 00:21:40 +02:00
Rickard Nilsson
d30701f2f1
nixos/opensmtpd: Add missing brackets in config ( #138989 )
...
* nixos/opensmtpd: Add missing brackets in config
Without this commit, you end up missing the sendmail suid wrapper,
because the "program" attribute would not override the right thing.
* Update nixos/modules/services/mail/opensmtpd.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-22 22:01:39 +02:00
Maximilian Bosch
e4e5deaa34
Merge pull request #138931 from Ma27/safeeyes-appdata
...
nixos/safeeyes: misc improvements
2021-09-22 20:36:33 +02:00
github-actions[bot]
09a7436fcc
Merge master into staging-next
2021-09-22 18:01:01 +00:00
Vladimír Čunát
8be5516756
Merge #138918 : Fix several NixOS errors in Hydra evaluation
...
In particular, this should unblock the trunk-combined jobset.
2021-09-22 17:28:37 +02:00
rnhmjoj
5abd562a18
nixos/kubernetes: fix deprecation warning
...
The option `containerd.configFile` has been replaced by an equivalent
`settings` attribute set.
2021-09-22 16:11:49 +02:00
Maximilian Bosch
f59c862770
nixos/safeeyes: add safeeyes to the global path
...
This will be needed for e.g. the settings dialog to work properly.
2021-09-22 13:12:27 +02:00
Maximilian Bosch
693ccbac67
nixos/safeeyes: add alsa-utils for aplay to the service's path
...
This is needed in order to use the `audiblealert`-plugin which requires
`aplay` to be available to work.
2021-09-22 13:07:33 +02:00
Alyssa Ross
b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/os-specific/linux/libfabric/default.nix
pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
rnhmjoj
08cd8667ee
nixos: filalex77 -> Br1ght0ne
...
The maintainers has changed username in 512c3c0a
2021-09-22 11:20:30 +02:00
rnhmjoj
88b3c29cf1
nixos: heimdalFull -> heimdal
...
The package has been renamed in 2018-05-01.
2021-09-22 11:20:30 +02:00
rnhmjoj
3f10924949
nixos/flannel: pkgs.etcdctl -> pkgs.etcd
...
The package has been renamed in 2018-04-25.
2021-09-22 11:20:30 +02:00
rnhmjoj
56ad0a49c8
nixos/dnscrypt-wrapper: fix nogroup
...
The group was actually there but I didn't add it by mistake.
This fixes the evaluation after for #133166 .
2021-09-22 11:20:24 +02:00
Ryan Mulligan
6a9003f316
nixos/discourse: add discourse.admin.skipCreate option
2021-09-21 16:45:59 -07:00
Jörg Thalheim
5c34515b99
Merge pull request #138544 from Izorkin/fix-netdata
...
nixos/netdata: fix working with disabled ipmi plugin
2021-09-22 00:43:58 +01:00
github-actions[bot]
611b805c53
Merge master into staging-next
2021-09-21 18:01:16 +00:00
embr
023239912c
nixos/mastodon: Add configurable web- and streaming concurrency
...
Might as well do this while I'm at it.
2021-09-21 16:35:17 +02:00
embr
8c1e6a8598
nixos/mastodon: Fix sidekiq's DB_POOL, add configurable concurrency
...
The `services.mastodon` module currently hardcodes sidekiq's concurrency
to 25, but doesn't set a DB pool size, which defaults to 5 or the number
of configured web threads.
(This behaviour is very strange, and arguably a mastodon bug.)
This also makes sidekiq's concurrency configurable, because 25 is a tad
high for the hardware I'm running it on.
2021-09-21 16:35:17 +02:00
github-actions[bot]
fd3d37414d
Merge master into staging-next
2021-09-21 12:01:29 +00:00
Sandro
e80237d8f4
Merge pull request #138609 from trofi/fix-smokeping
...
nixos/smokeping: drop dangling fping6 suid swapper
2021-09-21 13:44:54 +02:00
Michele Guerini Rocco
806e2b3643
Merge pull request #138748 from dschrempf/localtimed_nogroup
...
nixos/localtimed: nogroup fix
2021-09-21 13:35:30 +02:00
github-actions[bot]
fa2601f3b2
Merge master into staging-next
2021-09-21 06:01:04 +00:00
Artturi
3b2440afd0
Merge pull request #100120 from unode/cpupower-gui
...
linuxPackages.cpupower-gui: init at 1.0.0
2021-09-21 03:37:10 +03:00
Dominik Schrempf
fade6648c7
nixos/localtimed: nogroup fix
2021-09-20 22:16:09 +02:00
github-actions[bot]
ecf5e75910
Merge master into staging-next
2021-09-20 18:01:12 +00:00
Michele Guerini Rocco
2fcef20cb1
Merge pull request #138600 from austinbutler/tpm2-tss-group
...
nixos/tpm2: define group, fix after #133166
2021-09-20 18:34:39 +02:00
Guillaume Girol
f50fc9e7b2
Merge pull request #138582 from DarkDNA/greetd-nonogroup
...
nixos/greetd: Fix for nogroup removal.
2021-09-20 16:30:05 +00:00
davidak
d64c54199d
Merge pull request #138599 from bobby285271/pantheon-manual
...
nixos/panthoen: mention appcenter changes in manual
2021-09-20 18:10:29 +02:00
github-actions[bot]
9e5021eef4
Merge master into staging-next
2021-09-20 12:01:15 +00:00
happysalada
bdd04deff5
meilisearch: module cleanup
2021-09-20 16:12:29 +09:00
happysalada
6903737a8c
meilisearch: nixpkgs-fmt
2021-09-20 16:12:29 +09:00
Oleksii Filonenko
811fe35a66
nixos/meilisearch: init
...
Reviewed-by: Aaron Andersen <aanderse@users.noreply.github.com>
(cherry picked from commit 5844ea85c3ad96b8a2df9da50374c530e86a904d)
2021-09-20 16:12:29 +09:00
Sergei Trofimovich
9000350994
nixos/smokeping: drop dangling fping6 suid swapper
...
After recent change `services.smokeping.enable = true;` system
started failing the build as:
```
nixpkgs-master $ nix build --no-link -f nixos system --keep-going
...
Checking that Nix store paths of all wrapped programs exist... FAIL
The path /nix/store/kr2sr80g9ny74im6m6dyh9v44hnzm261-fping-5.0/bin/fping6 does not exist!
Please, check the value of `security.wrappers."fping6".source`.
```
`fping` does not provide `fping6` binary for a while. Let's just remove it.
Closes: https://github.com/NixOS/nixpkgs/issues/138581
2021-09-20 07:57:56 +01:00
github-actions[bot]
f666c4d10f
Merge master into staging-next
2021-09-20 06:01:17 +00:00
happysalada
b51e813153
elasticsearch: support version 6
2021-09-20 14:31:02 +09:00
Bobby Rong
2610f6e0df
nixos/panthoen: mention appcenter changes in manual
2021-09-20 10:06:22 +08:00
Amanda Cameron
bd28ff08d3
nixos/greetd: Fix for nogroup removal.
2021-09-19 17:37:27 -04:00
Austin Butler
b88b46b830
nixos/tcsd: make group uid dynamic
2021-09-19 12:42:46 -07:00
github-actions[bot]
78ca5a3e45
Merge master into staging-next
2021-09-19 18:01:13 +00:00
Guillaume Girol
07d82812bc
Merge pull request #138441 from symphorien/nonogroup-fixes-2
...
Fixes after #133166
2021-09-19 17:15:02 +00:00
Alyssa Ross
e2bb7997c4
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2111.section.md
2021-09-19 17:08:00 +00:00
Izorkin
1e54f84012
nixos/netdata: fix working with disabled ipmi plugin
2021-09-19 19:15:49 +03:00
Aaron Andersen
559449530f
Merge pull request #132319 from onny/opensnitch
...
nixos/opensnitch: Add module for opensnitch
2021-09-19 11:31:21 -04:00
Michele Guerini Rocco
108986ab71
Merge pull request #138515 from rnhmjoj/fix-physlock
...
nixos/physlock: fix broken wrapper
2021-09-19 17:06:38 +02:00
rnhmjoj
64f5d681d9
nixos/physlock: fix broken wrapper
...
- `user` doesn't exist -> `owner`
- set `setuid,group` as well (no longer optional)
2021-09-19 11:53:41 +02:00
