Martin Weinelt 6b67186fe9 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - pkgs/development/python-modules/crownstone-cloud/default.nix - pkgs/development/python-modules/exrex/default.nix - pkgs/development/python-modules/mkdocs-minify/default.nix - pkgs/development/python-modules/myjwt/default.nix - pkgs/development/tools/analysis/checkov/default.nix		2023-03-14 08:14:26 +01:00
..
config	qt5: use makeScopeWithSplicing	2023-03-09 21:16:03 +02:00
hardware	Merge pull request #217718 from Kiskae/nvidia/unbreak-6.2	2023-02-24 17:46:26 -03:00
i18n/input-method	nixos/manual: render module chapters with nixos-render-docs	2023-01-27 20:07:34 +01:00
installer	nixos-generate-config: update microcode only on bare metal	2023-03-13 20:15:13 +01:00
misc	Revert "nixos/polkit: guard static gid for polkituser behind state version"	2023-02-25 22:32:16 -05:00
profiles	Merge pull request #208956 from SuperSandro2000/profile-base-tcpdump	2023-01-17 01:20:31 +01:00
programs	Merge pull request #213301 from bcc32/atop-dont-leave-new-log-files	2023-03-13 20:20:40 +00:00
security	Revert "nixos/polkit: guard static gid for polkituser behind state version"	2023-02-25 22:32:16 -05:00
services	Merge pull request #220461 from SuperSandro2000/prometheus	2023-03-14 05:28:59 +01:00
system	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
tasks	Merge pull request #208269 from ElvishJerricco/systemd-stage-1-fsck	2023-02-17 10:06:39 +02:00
testing	Merge pull request #207801 from ElvishJerricco/systemd-stage-1-test-instrumentation	2022-12-28 01:43:03 +01:00
virtualisation	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-12 23:28:23 +01:00
module-list.nix	nimdow: Add nixos windowmanager option	2023-03-13 11:37:32 -05:00
rename.nix	Merge pull request #210477 from wineee/deepin-lib	2023-01-26 21:56:17 +08:00