Martin Weinelt d03d74aa67 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/aiopulse/default.nix - pkgs/development/python-modules/identify/default.nix - pkgs/development/python-modules/spur/default.nix		2023-03-12 23:28:23 +01:00
..
activation	nixos/version: add config.system.nixos.distroName and config.system.nixos.distroId	2023-01-14 16:19:06 -05:00
boot	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
etc	nixos/etc: skip resolv.conf in nixos-enter chroot	2023-01-02 01:41:29 +01:00
build.nix	treewide: automatically md-convert option descriptions	2022-07-30 15:16:34 +02:00