Dmitry Kalinkin 262fd63a72 Merge branch 'master' into staging-next ... Conflicts: pkgs/tools/networking/inetutils/default.nix		2021-08-26 00:57:08 -04:00
..
config	Merge pull request #133303 from rnhmjoj/cursor	2021-08-25 21:07:47 +02:00
hardware	nixos/hardware.firmware: fix evaluation after PR #122463	2021-08-21 09:20:16 +02:00
i18n/input-method
installer	Merge staging-next into staging	2021-08-18 00:01:59 +00:00
misc	nixos: rewrite uhub module	2021-08-11 09:51:23 +02:00
profiles	NixOS AWS AMI: enable the serial console on ttyS0	2021-08-20 12:42:02 -04:00
programs	Merge pull request #131695 from tomfitzhenry/calls	2021-08-26 04:44:01 +02:00
security	apparmor: Fix cups-client typo	2021-08-23 00:50:15 -07:00
services	Merge master into staging-next	2021-08-26 00:01:37 +00:00
system	Merge branch 'staging-next' into staging	2021-08-22 01:13:41 +02:00
tasks	Merge pull request #105786 from teto/fstab	2021-08-26 05:53:25 +02:00
testing
virtualisation	NixOS/amazonImageZfs: init	2021-08-25 10:42:35 -04:00
module-list.nix	Merge pull request #131695 from tomfitzhenry/calls	2021-08-26 04:44:01 +02:00
rename.nix