Vladimír Čunát 09f5763784 Merge branch 'master' into staging-next ... Conflicts: - pkgs/development/python-modules/pathspec/default.nix The hashes are equivalent, so it's not a real conflict. - pkgs/top-level/static.nix I can't see a solution, deffered redoing this to the later PR: https://github.com/NixOS/nixpkgs/pull/136849		2021-09-07 08:43:26 +02:00
..
config	nixos/fonts: fixup dd38ae1f	2021-08-29 11:03:13 +02:00
hardware	nixos/nvidia: remove extra space	2021-09-01 08:57:33 -04:00
i18n/input-method	nixos/fcitx5: autostart with xserver	2021-06-05 09:22:58 +08:00
installer	Merge staging-next into staging	2021-08-18 00:01:59 +00:00
misc	kexec-tools: rename from kexectools to match the project name	2021-09-03 10:17:21 -04:00
profiles	NixOS AWS AMI: enable the serial console on ttyS0	2021-08-20 12:42:02 -04:00
programs	modules/programs/command-not-found: Fix ShellCheck warnings	2021-09-06 08:49:34 +09:00
security	apparmor: Fix cups-client typo	2021-08-23 00:50:15 -07:00
services	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
system	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-09-03 18:23:45 +00:00
tasks	Merge pull request #135315 from johnjameswhitman/johnjameswhitman/fix-wlan-sub-interfaces	2021-09-02 09:37:04 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	NixOS/amazonImageZfs: init	2021-08-25 10:42:35 -04:00
module-list.nix	Merge pull request #135182 from lovesegfault/nixos-distcc	2021-09-02 20:41:28 +00:00
rename.nix	quagga: remove	2021-04-22 12:48:48 +02:00