Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5		2021-02-19 17:15:31 +01:00
..
config	Merge pull request #110627 from 4z3/use-real-user-name-for-per-user-packages	2021-02-15 12:45:24 +01:00
hardware	Merge pull request #111996 from rnhmjoj/i2c	2021-02-06 18:22:34 +01:00
i18n/input-method	fcitx5: update doc	2021-01-24 02:10:23 +01:00
installer	nixos/tools: generate an xserver config	2021-02-13 18:46:01 -05:00
misc	nixos/dysnomia nixos/disnix: Drop modules	2021-01-27 11:27:09 +01:00
profiles	qemu-guest: remove security.rngd setting	2021-01-27 18:27:34 +01:00
programs	nixos/captive-browser: make it work without a fixed interface	2021-02-12 14:35:51 +08:00
security	Merge pull request #108819 from SuperSandro2000/nginx-module	2021-01-30 21:46:35 +01:00
services	Merge pull request #113674 from SuperSandro2000/fix-collection16	2021-02-19 13:27:03 +01:00
system	Merge pull request #107402 from ctem/fix/luksroot-master	2021-02-19 15:42:45 +00:00
tasks	Merge pull request #111786 from flokli/systemd-247.3	2021-02-12 12:52:49 +01:00
testing	nixos/service-runner: fix evaluation	2021-02-05 13:02:56 +01:00
virtualisation	nixos/hypervGuest: add Microsoft Synthetic Keyboard driver	2021-02-17 08:01:34 +00:00
module-list.nix	Merge pull request #110615 from jansol/pipewire	2021-02-17 07:41:27 +00:00
rename.nix	nixos.flashpolicyd: drop	2021-02-08 09:38:48 -08:00