github-actions[bot]
79b7a67b55
Merge master into staging-next
2021-02-17 00:36:31 +00:00
WORLDofPEACE
8a2bd1342e
Merge pull request #113064 from worldofpeace/fix-108124
...
nixos/tools: make desktopConfiguation types.listOf types.lines
2021-02-16 15:16:53 -05:00
github-actions[bot]
287495a7aa
Merge master into staging-next
2021-02-16 18:16:57 +00:00
Jade
f83d4f86d5
Nextcloud redirect fix
2021-02-16 11:58:38 -05:00
Izorkin
96f0c2c191
mastodon, nixos/mastodon: use the same nodejs package in package and module
2021-02-16 17:57:31 +01:00
Julien Langlois
f3828c53c9
nixos/services/kmscon: fix systemd configuration
...
This fixes https://github.com/NixOS/nixpkgs/issues/112616
2021-02-15 16:58:54 -05:00
github-actions[bot]
0ca7d945c2
Merge master into staging-next
2021-02-15 18:17:06 +00:00
Maximilian Bosch
274109a8d6
Merge pull request #113108 from Ma27/nextcloud-acme
...
nixos/nextcloud: fix regex to not return 404 on ACME challenges
2021-02-15 18:53:35 +01:00
Maximilian Bosch
31864de85d
Merge pull request #113187 from Ma27/nextcloud-dav
...
nixos/nextcloud: redirect /.well-known/*dav to https url
2021-02-15 18:53:19 +01:00
github-actions[bot]
cd518a718b
Merge master into staging-next
2021-02-15 12:20:12 +00:00
Lassulus
2489d95c1c
Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages
...
nixos/users: use proper name for per-user packages
2021-02-15 12:45:24 +01:00
Izorkin
e3a7270e3d
nixos/mastodon: fix mastodon-init-db script
2021-02-15 11:43:03 +01:00
Izorkin
4255954d97
nixos/mastodon: optimize permissions
2021-02-15 11:43:03 +01:00
Izorkin
424e7b0f5d
nixos/mastodon: use unix socket to default
2021-02-15 11:43:03 +01:00
Izorkin
f1adea1a94
nixos/mastodon: add option trustedProxy
2021-02-15 11:43:03 +01:00
Maximilian Bosch
f89652a23e
nixos/nextcloud: redirect /.well-known/*dav to https url
...
Fixes #113155
2021-02-15 11:03:12 +01:00
github-actions[bot]
0630986bf7
Merge master into staging-next
2021-02-15 00:37:03 +00:00
Jan Solanti
3d69688289
pipewire: rename pwms to media-session
2021-02-14 23:54:23 +02:00
Jan Solanti
b9b9fff6d6
pipewire: use strictly upstream defaults
2021-02-14 23:54:17 +02:00
Aaron Andersen
796e3d6ff6
Merge pull request #111695 from jansol/xow
...
xow: fix service
2021-02-14 13:32:55 -05:00
github-actions[bot]
4f3b8e7b41
Merge master into staging-next
2021-02-14 18:16:14 +00:00
Jean-Paul Calderone
9338023577
Fix typo in the GitLab smtp auth options docs
2021-02-14 09:55:54 -05:00
Maciej Krüger
8429831b67
Merge pull request #112746 from mkg20001/qemu-extra-disks
2021-02-14 13:20:44 +01:00
Maciej Krüger
59eb6d3ee3
nixosTests.*: update to use virtualisation.fileSystems
2021-02-14 12:23:50 +01:00
Maximilian Bosch
055b7e2a5d
nixos/nextcloud: fix regex to not return 404 on ACME challenges
...
Fixes #113027
2021-02-14 12:23:16 +01:00
github-actions[bot]
8d8fe35281
Merge master into staging-next
2021-02-14 00:37:56 +00:00
pasqui23
04ef00987a
nixos/switcheroo-control: add to modules-list.nix ( #113052 )
2021-02-14 01:06:01 +01:00
WORLDofPEACE
452f7e14d4
nixos/tools: generate an xserver config
...
The desktop configuration won't enable xserver.
If there's multiple desktops enabled they will now evaluate properly.
2021-02-13 18:46:01 -05:00
WORLDofPEACE
94f0210e60
nixos/tools: make desktopConfiguation types.listOf types.lines
...
This fixes #108124 .
2021-02-13 18:45:27 -05:00
Martin Weinelt
286f8cdbfc
Merge branch 'master' into staging-next
2021-02-14 00:40:47 +01:00
zowoq
37f1ed7ca4
nixos/podman: install systemd files
...
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:39 +10:00
github-actions[bot]
1c7975a26f
Merge master into staging-next
2021-02-13 18:15:59 +00:00
Ninjatrappeur
2f80425e6e
Merge pull request #112801 from erosennin/prosody-tests
...
nixos/prosody: fix broken tests
2021-02-13 15:22:48 +01:00
Milan
3b77e7c967
nixos/jitsi-videobridge: add apis option ( #112960 )
...
The `--apis=` command line parameter passed to Jitsi Videobridge is
required to monitor a Jitsi Meet instance for example via the prometheus
exporter [jitsiexporter](https://git.xsfx.dev/prometheus/jitsiexporter ).
2021-02-13 15:04:58 +01:00
github-actions[bot]
257f90a43f
Merge master into staging-next
2021-02-13 12:19:38 +00:00
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
Andrey Golovizin
1f3c9fd0ef
nixos/tests/networking: fix DHCP range
...
Exclude static 192.168.*.2 addresses from the dynamic address range to
prevent different interfaces from getting the same address.
Seems like configuring a fixed IPv4 address does not automatically
exclude it from the dynamic address range.
Should fix occasional failures of
nixos.tests.networking.scripted.macvlan and possibly other networking
tests relying on DHCP.
2021-02-10 20:33:49 +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
6ee5348b55
nixos/tests: add keepassxc
...
Test whether KeePassXC launches correctly.
2021-02-08 15:39:37 +01: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
Ctem
1c9b2f18ce
boot.initrd.luks: fix case Yubikey
-> YubiKey
2021-02-08 04:01:47 +09:00
Eric Bailey
35056b3b61
maintainers/teams: add beam team
2021-02-07 13:01:11 -06:00
Ctem
9e8781328e
boot.initrd.luks: add reusePassphrases support for YubiKey 2FA
2021-02-08 03:55:17 +09: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