Jan Tojnar b8b9f52393 Merge branch 'master' into staging-next ... Conflicts: - pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0 and f6c5761935.		2022-05-21 17:52:39 +02:00
..
config	nixos/console: inird -> initrd	2022-04-30 14:43:09 -07:00
hardware	nixos: don't put non-firmware in hardware.firmware	2022-05-12 15:17:51 +00:00
i18n/input-method	nixos/fcitx5: add the setting of RIME_DATA_DIR and options for rime-data	2022-04-25 13:39:19 +08:00
installer	Merge #172668: installation-cd: add more guest tools to NixOS graphical installation base	2022-05-19 12:12:10 +02:00
misc	nixos/locate: clarification in warning message (#173247)	2022-05-17 16:47:33 +02:00
profiles	Merge pull request #169113 from ElvishJerricco/systemd-stage-1-installer-tests	2022-04-30 13:18:57 -07:00
programs	nix-ld: 1.0.0 -> 1.0.2	2022-05-15 21:06:05 +02:00
security	Merge pull request #156822 from xfix/wrapper-assert-argc-at-least-one	2022-05-16 18:52:51 +02:00
services	Merge branch 'master' into staging-next	2022-05-21 17:52:39 +02:00
system	nixos: don't put non-firmware in hardware.firmware	2022-05-12 15:17:51 +00:00
tasks	Merge pull request #171650 from helsinki-systems/feat/config-systemd-package	2022-05-09 10:23:04 +02:00
testing	nixos/version: Warn about using the default of system.stateVersion	2022-05-05 12:22:31 +02:00
virtualisation	Merge pull request #172131 from euank/ena-2.7.1	2022-05-12 01:38:24 +03:00
module-list.nix	Merge pull request #112682 from hax404/upterm	2022-05-13 18:24:54 +02:00
rename.nix	nixos/ssmtp: drop module	2022-04-17 00:44:50 +02:00