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
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
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
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