Commit Graph

19100 Commits

Author SHA1 Message Date
sternenseemann
1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Graham Christensen
87ef832e49 nixos: mjolnir: literalExample -> literalExpression 2021-11-12 21:06:17 -05:00
Graham Christensen
fd1f8e1498 Merge branch 'master' into mjolnir-init 2021-11-12 20:56:14 -05:00
Sandro
312a3af375 Merge pull request #145257 from astro/openwebrx 2021-11-13 02:43:01 +01:00
Artturi
76439257f4 Merge pull request #145394 from Artturin/removedeprecated1 2021-11-13 03:19:16 +02:00
github-actions[bot]
e972a20a60 Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot]
c0c7fbda14 Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi
4e61e1242c Merge pull request #144933 from Artturin/ananicyinit
ananicy: init at unstable-2021-11-05
2021-11-12 21:08:14 +02:00
github-actions[bot]
65356b24bf Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot]
699560194d Merge master into staging-next 2021-11-12 18:01:08 +00:00
Sandro
6aa376ea9b Merge pull request #138336 from shdpl/release-21.05 2021-11-12 18:43:15 +01:00
Sandro
fee23ab3f1 Merge pull request #84154 from eadwu/clight/location-assertion 2021-11-12 18:09:40 +01:00
Mariusz `shd` Gliwiński
8e3d255347 [nixos/lightdm] allow for background option to be either path or color 2021-11-12 17:31:13 +01:00
Travis Athougies
82037871bb nixos/postfix: Use better types for submissionOptions and submissionsOptions (#138205) 2021-11-12 17:28:39 +01:00
github-actions[bot]
a4e03b8977 Merge staging-next into staging 2021-11-11 18:01:50 +00:00
github-actions[bot]
f2d7271432 Merge master into staging-next 2021-11-11 18:01:13 +00:00
Maximilian Bosch
dbe1a4804d Merge pull request #145192 from happysalada/plausible_add_release_cookie
plausible: add remote connection with iex
2021-11-11 18:24:10 +01:00
Sandro
d3f2137f5c Merge pull request #144250 from aanderse/nixos/zabbixWeb 2021-11-11 15:21:09 +01:00
Artturin
8743e81cd3 nixos/ananicy: init 2021-11-11 02:05:42 +02:00
github-actions[bot]
62b9b0d9e8 Merge staging-next into staging 2021-11-11 00:02:20 +00:00
github-actions[bot]
b199af176d Merge master into staging-next 2021-11-11 00:01:45 +00:00
Astro
f1020d20fa nixos/openwebrx: init 2021-11-10 23:42:18 +01:00
Artturin
0686311257 nixos/lxc-container: remove deprecated literalExample 2021-11-10 23:55:13 +02:00
Sandro
93a0ff08d8 Merge pull request #141551 from astro/collectd-plugin-config 2021-11-10 20:11:24 +01:00
github-actions[bot]
5e2757bf32 Merge staging-next into staging 2021-11-10 18:02:01 +00:00
github-actions[bot]
259e08cd22 Merge master into staging-next 2021-11-10 18:01:21 +00:00
Robert Hensing
6c690b07f7 Merge pull request #144788 from hercules-ci/double-default-qemu-diskSize
virtualisation/qemu-vm: Double the default diskSize
2021-11-10 17:47:29 +01:00
github-actions[bot]
9618986955 Merge staging-next into staging 2021-11-10 12:01:57 +00:00
github-actions[bot]
84d856a651 Merge master into staging-next 2021-11-10 12:01:22 +00:00
xaverdh
03a257e5a3 treewide: quote urls according to rfc 0045 (#145260)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-10 11:37:56 +01:00
github-actions[bot]
d5964b8c81 Merge staging-next into staging 2021-11-10 00:02:09 +00:00
github-actions[bot]
6e4d2d1f10 Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro
e5ac2e1a52 Merge pull request #122452 from ju1m/tor 2021-11-09 21:50:57 +01:00
Christian Kögler
33ffba995d NixOS: Document impurity issues with boot.binfmt.emulatedSystems (#142778)
* NixOS: Document impurity issues with boot.binfmt.emulatedSystems

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

* Apply suggestions from code review

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
2021-11-09 21:49:45 +01:00
Sandro Jäckel
c819ee9b67 nixos/tinc: disable chroot by default 2021-11-09 21:30:18 +01:00
Eelco Dolstra
58a9cca8cd nix-fallback-paths.nix: Update to 2.4 2021-11-09 10:47:10 -08:00
github-actions[bot]
56736d0fbc Merge staging-next into staging 2021-11-09 18:02:05 +00:00
github-actions[bot]
7414a16ee5 Merge master into staging-next 2021-11-09 18:01:23 +00:00
Pascal Bach
9abd378c7e nixos/antennas: initial service 2021-11-09 17:00:06 +01:00
Maciej Krüger
11f1d8620a nixos/matomo: delete tmp folder to fix borked upgrades 2021-11-09 15:14:31 +01:00
Maciej Krüger
769f20e20a nixos/matomo: allow changing hostname easily 2021-11-09 15:10:01 +01:00
happysalada
aff0f5792b plausible: add remote connection with iex 2021-11-09 08:15:53 -05:00
github-actions[bot]
b1d2f20ea8 Merge staging-next into staging 2021-11-09 00:02:13 +00:00
github-actions[bot]
707b006bf7 Merge master into staging-next 2021-11-09 00:01:30 +00:00
Maximilian Bosch
25e6a0ad62 Merge pull request #143345 from happysalada/update_plausible
plausible: 1.3.0 -> 1.4.0
2021-11-08 23:48:53 +01:00
sternenseemann
d14ae62671 nixos/terminfo: inherit TERMINFO* env vars also for doas
This should mirror the behavior we implement for sudo: The TERMINFO and
TERMINFO_DIRS variables are inherited from the normal user's
environment, so terminfo files installed in the user's profile can be
found by ncurses applications running as root.
2021-11-08 14:05:24 -08:00
github-actions[bot]
9ecd6bf4df Merge staging-next into staging 2021-11-08 18:02:05 +00:00
github-actions[bot]
f14d7cb2f6 Merge master into staging-next 2021-11-08 18:01:24 +00:00
Sandro
1d30bfc9f1 Merge pull request #145050 from bb2020/swap 2021-11-08 17:28:39 +01:00
Astro
19fc2904f3 nixos/collectd: give plugins option a mergeable type 2021-11-08 17:09:56 +01:00