Jonathan Ringer 46fd0afcb3 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/pysdl2/default.nix pkgs/top-level/aliases.nix		2022-02-06 18:36:59 -08:00
..
config	nixos/users: Fix type error	2022-02-05 22:38:56 +01:00
hardware	nixos/nvidia: remove obsolete GDM on Wayland assertion	2022-02-01 19:22:04 +01:00
i18n/input-method	nixos/documentation: split options doc build	2022-01-02 19:46:13 +01:00
installer	nix-fallback-paths: update to 2.6.0	2022-01-31 18:53:43 -08:00
misc	Revert "flake.nix: Set nixpkgs.config.path"	2022-01-27 12:53:29 +01:00
profiles	nixos/nix-daemon: use structural settings	2022-01-26 21:04:50 -05:00
programs	Merge pull request #151105 from ncfavier/gio-extra-modules	2022-02-02 19:35:58 +01:00
security	google-compute-config: update config	2022-02-05 23:33:10 +03:00
services	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-06 18:36:59 -08:00
system	Merge pull request #155892 from hercules-ci/nixos-etc-unit-test	2022-02-06 16:12:25 +01:00
tasks	nixos/networking: Typo fix	2022-02-04 13:55:56 -05:00
testing	nixos/tests: also set TimeoutStart in systemd.user.extraConfig	2022-01-21 04:18:05 +01:00
virtualisation	Merge pull request #157761 from tp-la/amazon-ec2-utils	2022-02-07 01:53:35 +01:00
module-list.nix	Merge pull request #155892 from hercules-ci/nixos-etc-unit-test	2022-02-06 16:12:25 +01:00
rename.nix	nixos/pantheon/files: remove	2022-02-02 13:48:22 +08:00