Commit Graph

20327 Commits

Author SHA1 Message Date
Jörg Thalheim
c875e8e673
Merge pull request #107394 from yorickvP/beam-nox 2021-02-13 09:01:06 +00:00
github-actions[bot]
318f95e4c2
Merge master into staging-next 2021-02-13 06:16:33 +00:00
aszlig
2d5a31a3ef
Merge pull request #112819 (mkIf in systemd units)
@thelegy writes:

  unitOption is only used inside of attrsOf wich is perfectly capable of
  handling the attrsets from mkIf, though the checkUnitConfig test
  forbids it.

  This commit weakens that restriction to allow the usage of mkIf inside
  of systemd.services.<name>.serviceConfig.<something> etc.

While I personally don't like that we can't easily use
pushDownProperties from the module system and need to rely on internals,
we *already* use internals for the mkOverride case, so adding another
case for mkIf doesn't add a hard-to-find indirection.

I'm merging this, since this fixes a valid use case and it shouldn't
make refactoring worse than before.
2021-02-13 05:24:11 +01:00
Ryan Burns
5828d54356 nixosTests.installer: fix non-zfs grub tests
Now that grub2 is built without zfs support when possible, this is a
separate store path which may need to be made available to the installer.
2021-02-12 19:39:17 -08:00
github-actions[bot]
1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Luke Granger-Brown
cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
erictapen
b2dbb4f50e
nixos/mastodon: set environment for mastodon-init-dirs (#112917)
mastodon-init-dirs should have the same environment as the other
services, as it also calls rake. Especially RAILS_ENV was missing.
2021-02-12 20:31:44 +01:00
github-actions[bot]
b23b455f9a
Merge master into staging-next 2021-02-12 18:16:46 +00:00
Milan Pässler
4d6bfa473a
nixos/mastodon: init
Co-authored-by: Happy River <happyriver93@runbox.com>
Co-authored-by: ash lea <ashkitten@users.noreply.github.com>
Co-authored-by: Justin Humm <justin.humm@posteo.de>
2021-02-12 15:37:15 +00:00
github-actions[bot]
15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
Michael Raskin
27f172ebd1
Merge pull request #112019 from 7c6f434c/fix-service-runner
nixos/service-runner: fix evaluation
2021-02-12 08:50:52 +00:00
Peter Hoeg
04e9e9e510 nixos/captive-browser: make it work without a fixed interface
nixpkgs-fmt makes this a lot noisier than it has to be
2021-02-12 14:35:51 +08:00
github-actions[bot]
1551e9d6ee
Merge master into staging-next 2021-02-12 06:16:24 +00:00
Andrey Golovizin
3fd5a41676 nixos/prosody: fix broken tests 2021-02-12 06:54:20 +01:00
Mario Rodas
ffedd32f9f
Merge pull request #108511 from nagy/apache-lua-path-fix
nixos/httpd: fix lua paths
2021-02-11 20:04:42 -05:00
github-actions[bot]
344456f66a
Merge master into staging-next 2021-02-12 00:36:19 +00:00
Kevin Cox
4a22f8aa88
Merge pull request #112660 from turion/dev_test_vscodium
tests/vscodium: Fix race condition
2021-02-11 17:49:14 -05:00
Jan Beinke
97718a3584
nixos/systemd-lib: allow mkIf in unitOption
`unitOption` is only used inside of `attrsOf` wich is perfectly capable of
handling the attrsets from `mkIf`, though the checkUnitConfig test
forbids it. This commit weakens that restriction to allow the usage of
`mkIf` inside of `systemd.services.<name>.serviceConfig.<something>`
etc.
2021-02-11 22:18:21 +01:00
Daniel Nagy
7c121e60c5
nixos/httpd: fix lua paths
Account for the fact that, when creating a lua package without the
"withPackages" helper, we dont get an extra "lua" attribute in the
package.

Therefore we need to distinguish between the "withPackages" case and the
direct ( or "empty" ) lua package.

For example with this nixos config:

```nix
{
  services.httpd = {
      enable = true;
      package = pkgs.apacheHttpd.override {
        luaSupport = true;
        lua5 = pkgs.lua5_3.withPackages (ps: with ps; [ luafilesystem ] );
      };
    };
}
```

Here we say that we want to have apache to use a lua, packaged with the
`luafilesystem` module so that we can `require` that in scripts to
render http responses. There, the set that gets assigned to `lua5 ` does
not have a `luaversion` attribute, rather it has a `lua` attribute
wherein lies a `luaversion` attribute. If we dont package additional
modules, then we dont have that `lua` attribute in between and rather
directly have to use `luaversion` directly.
2021-02-11 11:56:06 +01:00
Maciej Krüger
45b8e83128
qemu-vm: add virtualisation.fileSystems to allow extra vm mounts 2021-02-11 11:02:45 +01:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Linus Heckemann
e4cf0e7a45
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
2021-02-10 23:04:24 +01:00
github-actions[bot]
7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
Manuel Bärenz
037d0489ca tests/vscodium: Fix race condition 2021-02-10 16:38:13 +01:00
Finn Behrens
92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
github-actions[bot]
bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00:00
Robert Hensing
696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing
460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00
Robert Hensing
0c22957751 nixos/hercules-ci-agent: Improve concurrentTasks option doc 2021-02-10 09:49:57 +01:00
Robert Hensing
fbabab7b16 nixos/hercules-ci-agent: Format with nixpkgs-fmt 2021-02-10 09:49:21 +01:00
github-actions[bot]
459eb2d924
Merge master into staging-next 2021-02-10 06:16:56 +00:00
Aaron Andersen
5473527775
Merge pull request #111312 from fdietze/patch-2
herbstluftwm: Add option to specify package
2021-02-09 20:13:03 -05:00
github-actions[bot]
8064cff79c
Merge master into staging-next 2021-02-09 18:16:33 +00:00
Ben Siraphob
e605e6205f power-profiles-daemon: pkgs.stdenv.lib -> pkgs.lib 2021-02-09 18:24:09 +07:00
Felix Dietze
5a827051aa herbstluftwm: Add option to specify package 2021-02-09 08:51:21 -01:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Martin Weinelt
2b454fcefd
Merge pull request #112391 from serokell/zhenya/oauth2-proxy-multiple-hosts
nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
2021-02-09 02:37:03 +01:00
Bernardo Meurer
c83a3d6fa7
Merge pull request #112335 from lovesegfault/firefox-no-flash
treewide: cleanup Adobe Flash Player
2021-02-09 01:35:24 +00:00
Martin Weinelt
47901b544c
Merge pull request #111302 from fooker/pr/nginx-default-type
nixos/nginx: serve unknown MIME-Types as binary
2021-02-09 01:44:47 +01:00
Jan Tojnar
faf133f854
Merge pull request #97972 from mvnetbiz/power-profiles-daemon 2021-02-09 01:41:04 +01:00
github-actions[bot]
5704fd1095
Merge master into staging-next 2021-02-09 00:36:17 +00:00
Matt Votava
65968a1f59
power-profiles-daemon: add test 2021-02-09 01:25:57 +01:00
Matt Votava
9a3190a960
power-profiles-daemon: init at 0.1, add service module 2021-02-09 01:25:56 +01:00
Guillaume Girol
2630a2df91
Merge pull request #108238 from snicket2100/more-dnscrypt-proxy-hardening
nixos/dnscrypt-proxy2: more service hardening
2021-02-08 19:22:44 +00:00
Robert Hensing
094362a35a
Merge pull request #112154 from hercules-ci/nixos-hercules-ci-agent-remove-patchNix
nixos/hercules-ci-agent: Remove patchNix
2021-02-08 19:21:00 +01:00
github-actions[bot]
1848e071c9
Merge master into staging-next 2021-02-08 18:17:03 +00:00
Bernardo Meurer
77a76e2ff8
release-notes/rl-2103: mention removal of flashplayer support from tree 2021-02-08 09:40:20 -08:00
Bernardo Meurer
ecaefda84a
nixos.flashpolicyd: drop 2021-02-08 09:38:48 -08:00
Manuel Bärenz
10b3773db0 vscode/vscodium: Add integration test 2021-02-08 13:59:37 +01:00
Zhenya Vinogradov
cc26d8592f nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
Fixes redirection after signing in when you use a single oauth2_proxy
instance for multiple domains.

X-Auth-Request-Redirect header is used to decide which URL to redirect
to after signing in. Specifying `request_uri` is enough in case you
need to redirect to the same domain that serves oauth2 callback
endpoint, but with multiple domains the you should include the scheme
and the host.
2021-02-08 15:28:52 +03:00
github-actions[bot]
bef005163c
Merge master into staging-next 2021-02-08 12:19:33 +00:00
Michele Guerini Rocco
c9f6a7f349
Merge pull request #111624 from rnhmjoj/thinkfan
nixos/thinkfan: rewrite for 1.2 update
2021-02-08 12:20:07 +01:00
WilliButz
bfa15ad956
Merge pull request #112351 from logan12358/prometheus-nginx-exporter-service
nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
2021-02-08 11:54:13 +01:00
Jörg Thalheim
c538a83d7c
Merge pull request #110623 from yurrriq/beam-team 2021-02-08 06:48:14 +00:00
github-actions[bot]
1c86cb40e9
Merge master into staging-next 2021-02-08 00:36:16 +00:00
Logan Glasson
c6ec272c78 nixos/prometheus-nginx-exporter: only create service if nginx exporter is enabled
On a system with nginx enabled but the prometheus exporter not enabled,
the prometheus-nginx-exporter service should not be created.
2021-02-08 13:17:56 +13:00
Jan Beinke
c4b5a703ab
tests/snapserver: Add test of connection and buffer size setting
This addition will cover part of the issue, that was fixed in #112295
and @mweinelt asked to improve the tests.
2021-02-07 23:43:59 +01:00
Eric Bailey
35056b3b61 maintainers/teams: add beam team 2021-02-07 13:01:11 -06:00
github-actions[bot]
2226996f6c
Merge master into staging-next 2021-02-07 18:16:08 +00:00
Sandro
a64370c164
Merge pull request #112295 from thelegy/snapserver-fix-buffer-options
nixos/snapserver: Fix buffer options not coercible to str
2021-02-07 17:10:34 +01:00
rnhmjoj
c753910d98
nixos/release-notes: mention thinkfan 1.2 update 2021-02-07 14:35:37 +01:00
rnhmjoj
02b872310d
nixos/thinkfan: rewrite for 1.2 update
Thinkfan underwent some major changes and the config file
is now based on YAML. This commit contains a number of changes:

- rewrite the module to output the new format;
- add a `settings` option, following RFC 0042[1];
- add fancy type-checking for the most critical options
- use upstream systemd units (which fix the resume issue)

[1]: https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2021-02-07 14:35:36 +01:00
github-actions[bot]
be6e431001
Merge master into staging-next 2021-02-07 12:19:15 +00:00
Jan Beinke
58d49db69d nixos/snapserver: Fix buffer options not coercible to str 2021-02-07 12:53:27 +01:00
Michele Guerini Rocco
237d5fa67a
Merge pull request #111452 from urbas/linuxPackages_rpi3-missing-ahci-module
system/boot: add includeDefaultModules option
2021-02-07 12:33:51 +01:00
Matej Urbas
2c769d7a6a system/boot: add includeDefaultModules option 2021-02-07 11:14:36 +00:00
Cole Helbling
1ed5b6a285
zfs: disable smartmontools mail functionality 2021-02-06 22:04:00 -08:00
Cole Helbling
370df31f1c
nixos/zfs: make zed mail optional
"zed does not need the ability to send email by default" --Eelco
2021-02-06 22:03:59 -08:00
github-actions[bot]
aaaf1218bf
Merge master into staging-next 2021-02-07 00:37:36 +00:00
Maximilian Bosch
31b1137c1d
Merge pull request #112013 from Ma27/nextcloud-file-check
nixos/nextcloud: fail early if {admin,db}passFile is not readable
2021-02-06 21:56:03 +01:00
github-actions[bot]
ce14b50f1c
Merge master into staging-next 2021-02-06 18:15:53 +00:00
Michele Guerini Rocco
75156546fc
Merge pull request #111996 from rnhmjoj/i2c
nixos/i2c: add module to set up i2c permissions
2021-02-06 18:22:34 +01:00
Robert Hensing
c808983caa nixos/hercules-ci-agent: Remove patchNix 2021-02-06 15:35:42 +01:00
rnhmjoj
afde028672
nixos/i2c: add module to set up i2c permissions
This is a very simple module that installs a single udev rule.
The rule set the ownership of all /dev/i2c-* devices to a
group, "i2c" by default but can be changed. The "uaccess" tag
also makes systemd add an ACL for users with a seat[1].

Fix issue #91771

[1]: https://enotty.pipebreaker.pl/2012/05/23/linux-automatic-user-acl-management/
2021-02-06 15:08:13 +01:00
github-actions[bot]
77db03ceac
Merge master into staging-next 2021-02-06 12:19:10 +00:00
adisbladis
6caa6cb3f5
Merge pull request #111924 from saschagrunert/cri-o-oci-hook
nixos/cri-o: add OCI seccomp bpf hook support
2021-02-06 12:03:44 +01:00
adisbladis
3c6035cd9a
Merge pull request #106767 from erikarvstedt/fix-container-pkgs-2
nixos-container: fix `nixpkgs` container options being ignored
2021-02-06 11:57:14 +01:00
Scriptkiddi
a0fa916147 nixos/venus: Dropping module 2021-02-05 22:53:23 -08:00
github-actions[bot]
fadee272e0
Merge staging-next into staging 2021-02-06 00:35:48 +00:00
Michael Raskin
e248519cb9
Merge pull request #104003 from felschr/feat/etebase-server
etebase-server: init at 0.7.0
2021-02-05 21:37:34 +00:00
Alexandre Macabies
255882fbcc nixos/snapserver: add AF_NETLINK to allowed address families
This is necessary for Librespot, which is spawned by snapserver in the
same cgroup. Librespot requires querying local ip links and addresses
for MDNS (Zeroconf/Avahi), and does so through NETLINK interface.
2021-02-05 19:23:25 +01:00
Alexandre Macabies
a36cc03d96 nixos/snapserver: update available stream types for v0.21.0
* Add 'librespot' (new name for 'spotify'), 'alsa', 'tcp'.
* Add a warning about the spotify -> librespot rename.
* Fix the deprecated example `mode = "listen"` for type 'pipe'.
* Update the tests to include a straightforward 'tcp' test.
2021-02-05 19:23:24 +01:00
github-actions[bot]
2bd4b7104c
Merge staging-next into staging 2021-02-05 18:16:38 +00:00
Kevin Cox
48f6dbe1f8
Merge pull request #109065 from Technical27/add-auto-cpufreq-module
nixos/auto-cpufreq: init module
2021-02-05 13:15:13 -05:00
ajs124
536fe36e23
Merge pull request #112050 from helsinki-systems/revert-111456-top-level
Revert "nixos/top-level: add specialisation.<name>.configuration type"
2021-02-05 18:12:51 +01:00
Jan Tojnar
493bbc968b
Merge pull request #95337 from pasqui23/switchctl 2021-02-05 18:05:39 +01:00
Fritz Otlinghaus
56c42142ed Revert "nixos/top-level: add specialisation.<name>.configuration type"
This reverts commit 05fbc82771.
2021-02-05 17:49:06 +01:00
Pasquale
f5f9a069d9
nixos/switcheroo-control: added nixos option
node/switcheroo-control: better formatting
2021-02-05 17:39:44 +01:00
github-actions[bot]
bd1a0c9702
Merge staging-next into staging 2021-02-05 12:19:39 +00:00
Michael Raskin
9486375887 nixos/service-runner: fix evaluation
Follow-up to: nixos/systemd: allow preStart with other ExecStartPre cmdlines #109976

As the additional ExecStartPre and ExecStartPost are now lists, update
their processing by service-runner.nix
2021-02-05 13:02:56 +01:00
Maximilian Bosch
778238c6b1
Merge pull request #109144 from sephalon/nextcloud-service-doc
nixos/nextcloud: document adminpassFile permissions
2021-02-05 12:54:59 +01:00
Maximilian Bosch
f4817027c1
nixos/nextcloud: fail early if {admin,db}passFile is not readable
Otherwise `nextcloud-setup.service` fails during the installation and
thus leaves a corrupted state.
2021-02-05 12:34:08 +01:00
Sascha Grunert
e2b7bdd08d
nixos/cri-o: add OCI seccomp bpf hook support
We now set the hooks dir correctly if the OCI hook is enabled. CRI-O
supports this specific hook from v1.20.0.

Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
2021-02-05 11:04:49 +01:00
Scriptkiddi
4cf63ef007
nixos/cdemu: add types 2021-02-05 10:39:25 +01:00
github-actions[bot]
3c4d8b38c4
Merge staging-next into staging 2021-02-05 00:36:22 +00:00
Michael Weiss
d0b891c828
isync: 1.3.4 -> 1.4.0
Important changes:
- The 'isync' compatibility wrapper was removed.
- The Master/Slave configuration keywords where deprecated and should be
  replaced with Far/Near. All users should update their configuration
  file accordingly. It's a trivial change and the old Master/Slave
  keywords will still work for now but result in the following message:
  Notice: Master/Slave are deprecated; use Far/Near instead.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-04 19:54:54 +01:00
Jan Tojnar
91109ce94a
Merge branch 'staging-next' into staging 2021-02-04 15:02:14 +01:00
Ben Wolsieffer
f413b2bc51 Revert "nixos/kernel.nix: ensure same kernel is used"
This reverts commit 78f915a002.
2021-02-03 20:31:22 -05:00
github-actions[bot]
a93a3ec715
Merge staging-next into staging 2021-02-04 00:35:42 +00:00
Fritz Otlinghaus
05fbc82771 nixos/top-level: add specialisation.<name>.configuration type 2021-02-03 16:27:22 -08:00