Merge branch 'staging-next' into staging

Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5

pkgs/tools/text/ripgrep/default.nix

@@ -1,5 +1,4 @@
 { lib, stdenv
-, nixosTests
 , fetchFromGitHub
 , rustPlatform
 , asciidoctor
@@ -43,6 +42,8 @@ rustPlatform.buildRustPackage rec {
     echo "abc\nbcd\ncde" > "$file"
     $out/bin/rg -N 'bcd' "$file"
     $out/bin/rg -N 'cd' "$file"
+  '' + lib.optionalString withPCRE2 ''
+    echo '(a(aa)aa)' | $out/bin/rg -P '\((a*|(?R))*\)'
   '';
 
   meta = with lib; {