Michele Guerini Rocco
828a3b5d93
Merge pull request #139367 from andersk/gnome-shell-wrapped
...
nixos/gnome: Fix broken .gnome-shell-wrapped wrapper
2021-09-25 10:12:51 +02:00
Anders Kaseorg
98fe3260c6
nixos/gnome: Fix broken .gnome-shell-wrapped wrapper
...
The owner and group options are required after #126289 .
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-09-24 17:58:08 -07:00
Kim Lindberger
0686c40309
Merge pull request #139180 from ryantm/dev/ryantm/discourse-tmp
...
discourse: enable restoring backups bigger than RAM
2021-09-24 14:31:46 +02:00
Ryan Burns
40299257cc
Merge branch 'master' into staging-next
2021-09-23 18:43:00 -07:00
Sandro
3d2ed13aaa
Merge pull request #139189 from yurrriq/helm-3.7.0
2021-09-23 21:29:10 +02: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
Ryan Mulligan
f933c68374
discourse: enable restoring backups bigger than RAM
...
When restoring a backup, discourse decompresses the backup archive in
the /share/discourse/tmp dir. Before this change, it is linked to /run
which is typically backed by memory, so the backup will fail to
restore if you do not have enough memory on your system to contain the
backup. This has already happened to me on two small forums.
This moves tmp to the StateDirectory /var/lib/discourse/tmp which is
typically backed by disk.
2021-09-23 09:59:31 -07:00
Eric Bailey
bbdb34607e
kubernetes-helm: 3.6.3 -> 3.7.0
2021-09-23 11:26:20 -05: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
rnhmjoj
b6fbbe768d
nixos/containerd: use v2 settings by default
...
Kubernetes is using v2 setting names and is the only module
in Nixpkgs using containerd, so it makes sense to upgrade.
2021-09-23 00:18:58 +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
rnhmjoj
22d05f8fa2
nixos/plotinus: fix evaluation
...
Apparently setting a variable via `environment.variables` when the same
is already present in `environment.sessionVariables` (that is merged
into the former option) creates a conflict.
For reference: this started with the change in #101274 .
2021-09-22 15:53:29 +02:00
rnhmjoj
a8576d4053
nixos/tests/mpv: remove deprecated mpv-with-scripts
...
It has been replaced by wrapMpv in 2020-05-22.
2021-09-22 15:40:59 +02:00
rnhmjoj
cbd515e44c
nixos/tests/atop: remove top-level string
...
Attributes in the top-level of a test should be derivations,
otherwise they will cause an evaluation failure in hydra.
2021-09-22 15:07:15 +02:00
rnhmjoj
699b8d671d
nixos/tests/wasabibackend: fix bitcoind config
...
Since c6017d98
services.bitcoind is submodule.
2021-09-22 14:48:14 +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
rnhmjoj
df49f6565c
nixos/tests/pantheon: fix missing lib
2021-09-22 12:59:09 +02:00
rnhmjoj
c744ecb69f
nixos/tests/systemd-networkd-ipv6-prefix-delegation: fix wrapper
...
The owner,group options are mandatory after #126289 .
2021-09-22 12:40:03 +02:00
rnhmjoj
b53a5b91b9
nixos/atop: fix broken wrapper
...
The setuid,owner,group options are mandatory after #126289 .
2021-09-22 12:38:19 +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
196621010c
nixos/tests/mariadb-galera-rsync: fix nogroup
...
This fixes the evaluation after for #133166 .
2021-09-22 11:49:11 +02:00
rnhmjoj
113cc7b136
nixos/tests/mariadb-galera-mariabackup: fix nogroup
...
This fixes the evaluation after for #133166 .
2021-09-22 11:46:30 +02:00
rnhmjoj
20ad669618
nixos/tests/minio: fix deprecation warning
...
The `accessKey` and `secretKey` options have been deprecated in favour
of the new `rootCredentialsFile`.
2021-09-22 11:35:22 +02:00
rnhmjoj
87d76b1783
nixos/tests/mysql: fix nogroup
...
This fixes the evaluation after for #133166 .
2021-09-22 11:20:30 +02:00
rnhmjoj
08cd8667ee
nixos: filalex77 -> Br1ght0ne
...
The maintainers has changed username in 512c3c0a
.
2021-09-22 11:20:30 +02:00
rnhmjoj
1f55c7e022
nixos/tests: drop latestKernel.hardened
...
The latest kernel does not guarantee a hardened version anymore,
see ga5341beb for the motivation.
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
1f826a7164
nixos/tests/ec2: fix conflicting option values
2021-09-22 11:20:30 +02:00
rnhmjoj
e2a668224f
nixos/tests/enlightenment: fix renamed options
...
All program-specific `autoLogin` options have been unified under
`displayManager.autoLogin`.
2021-09-22 11:20:29 +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
rnhmjoj
169cd512d4
nixos/tests/cntr: fix evaluation
...
The maintainer email address is srk@48.io , hence srk, but the attribute
name in the maintainer list is actually sorki.
2021-09-22 09:06:50 +02:00
rnhmjoj
78b0883e2f
nixos/tests/prometheus-exporters: fix nogroup
...
Add a group after the removal of the nogroup default in #133166 .
2021-09-22 09:06:50 +02:00
rnhmjoj
5b4f8afae4
nixos/tests: stdenv.lib -> lib
...
These must have been reintroduced by mistake after the deprecation.
2021-09-22 09:06:50 +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
Sandro
bfc38d3d0d
Merge pull request #125966 from ju1m/apparmor
2021-09-21 22:10:10 +02:00
Sandro
f18f2d87f3
Merge pull request #135284 from legendofmiracles/weylus
2021-09-21 22:04:38 +02:00
Sandro
41e2ef1012
Merge pull request #138731 from illdefined/feature/memoryallocator-mimalloc
2021-09-21 20:06:35 +02: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