Merge master into staging-next

NixOS · Oct 10, 2024 · 1404154 · 1404154
2 parents d671f1f + 9ee9cac
commit 1404154
Show file tree

Hide file tree

Showing 100 changed files with 3,429 additions and 2,013 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false
 
 nixos/modules/module-list.nix merge=union
 # pkgs/top-level/all-packages.nix merge=union
+
+ci/OWNERS linguist-language=CODEOWNERS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false

		nixos/modules/module-list.nix merge=union
		# pkgs/top-level/all-packages.nix merge=union

		ci/OWNERS linguist-language=CODEOWNERS