Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
	pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
	pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
	pkgs/applications/version-management/git-stack/default.nix
	pkgs/by-name/bo/boxbuddy/package.nix
	pkgs/by-name/ca/capnproto-rust/package.nix
	pkgs/by-name/ca/cargo-binstall/package.nix
	pkgs/by-name/ca/cargo-deb/package.nix
	pkgs/by-name/ca/cargo-modules/package.nix
	pkgs/by-name/cl/clapboard/package.nix
	pkgs/by-name/do/dotslash/package.nix
	pkgs/by-name/fe/felix-fm/package.nix
	pkgs/by-name/gi/gitlab-ci-ls/package.nix
	pkgs/by-name/go/gotify-desktop/package.nix
	pkgs/by-name/ha/handlr-regex/package.nix
	pkgs/by-name/ir/iroh/package.nix
	pkgs/by-name/ma/manga-tui/package.nix
	pkgs/by-name/ob/obs-cmd/package.nix
	pkgs/by-name/ox/oxlint/package.nix
	pkgs/by-name/pi/pik/package.nix
	pkgs/by-name/re/reindeer/package.nix
	pkgs/by-name/rn/rnr/package.nix
	pkgs/by-name/ro/routinator/package.nix
	pkgs/by-name/rw/rwpspread/package.nix
	pkgs/by-name/sk/skim/package.nix
	pkgs/by-name/so/sope/package.nix
	pkgs/by-name/so/soteria/package.nix
	pkgs/by-name/sp/spacer/package.nix
	pkgs/by-name/st/stylance-cli/package.nix
	pkgs/by-name/su/subxt/package.nix
	pkgs/by-name/sw/swayfx-unwrapped/package.nix
	pkgs/by-name/te/television/package.nix
	pkgs/by-name/to/toast/package.nix
	pkgs/by-name/wa/wastebin/package.nix
	pkgs/by-name/wi/wit-bindgen/package.nix
	pkgs/by-name/wo/workshop-runner/package.nix
	pkgs/development/interpreters/wasmtime/default.nix
	pkgs/development/tools/rust/cargo-edit/default.nix
	pkgs/development/tools/sentry-cli/default.nix
	pkgs/misc/t-rec/default.nix
	pkgs/tools/video/yaydl/default.nix

0 files changed, 0 insertions, 0 deletions