github-actions[bot]
afcea01614
Merge master into staging-next
2021-02-17 18:14:04 +00:00
Eelco Dolstra
dd63561bcb
Remove ripgrep test
...
VM tests are expensive (and prone to random failures) so they should
only be used for things that can only be tested in a VM, not for
things that could be tested in a regular checkPhase or derivation.
2021-02-17 17:57:09 +01:00
Maximilian Bosch
910e103fcb
Merge pull request #113323 from witchof0x20/nextcloud_redirect_fix
...
nixos/nextcloud: DAV .well-known redirect fix
2021-02-17 17:23:35 +01:00
Francesco Gazzetta
d56f72178e
nixos/mlmmj: use appropriate postfix options
...
instead of extra*
should make the module more interoperable with others
2021-02-17 16:00:59 +00:00
Francesco Gazzetta
7596e7a495
nixos/mlmmj: add more list headers
...
since we already add a couple of default headers, it makes sense to have
a sensible default and add the unsubscribe header and friends
2021-02-17 15:59:06 +00:00
Justin Humm
40f60919ab
nixos/mastodon: fix group membership for nginx
...
4255954d97
set the StateDirectory to 0750,
but nginx wasn't in the Mastodon group. This commit also deletes a line,
that probably was intended to serve this purpose, but makes no sense.
Why should the Mastodon user be added as an extraGroup to the nginx
user?
2021-02-17 15:16:14 +01:00
github-actions[bot]
f68cf6f574
Merge master into staging-next
2021-02-17 12:20:00 +00:00
ilian
29a6c9b9a3
nixos/hypervGuest: add Microsoft Synthetic Keyboard driver
...
Ensure that the HyperV keyboard driver is available in the early
stages of the boot process. This allows the user to enter a disk
encryption passphrase or repair a boot problem in an interactive
shell.
2021-02-17 08:01:34 +00:00
Jörg Thalheim
9783fa9554
Merge pull request #110615 from jansol/pipewire
2021-02-17 07:41:27 +00:00
github-actions[bot]
3ed237717a
Merge master into staging-next
2021-02-17 06:14:47 +00:00
Peter Hoeg
bf11a28bd3
nixos/bluetooth: hotfix for stupidity
2021-02-17 05:58:08 +00:00
Peter Hoeg
1a4c039432
nixos/bluetooth: add support for disabling plugins
2021-02-17 02:40:59 +00:00
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
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
github-actions[bot]
1d62dc37db
Merge master into staging-next
2021-02-13 00:36:11 +00:00