Merge staging-next-26.05 into staging-26.05

.github/workflows/check.yml

@@ -122,7 +122,7 @@ jobs:
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           script: |
-            const { default: checkManualFileEdits } = await import('${{ github.workspace }}/trusted/ci/github-script/manual-file-edits.js')
+            const { default: checkManualFileEdits } = await import('${{ github.workspace }}/trusted/ci/github-script/manual-file-edits.ts')
             await checkManualFileEdits({
               github,
               context,

.github/workflows/test.yml

@@ -84,6 +84,7 @@ jobs:
               'ci/github-script/commits.js',
               'ci/github-script/get-pr-commit-details.js',
               'ci/github-script/lint-commits.js',
+              'ci/github-script/manual-file-edits.ts',
               'ci/github-script/merge.js',
               'ci/github-script/package.json',
               'ci/github-script/package-lock.json',

ci/github-script/manual-file-edits.ts

@@ -2,21 +2,18 @@ import { getCommitDetailsForPR } from './get-pr-commit-details.js'
 import { dismissReviews, postReview } from './reviews.js'
 import { classify } from './supportedBranches.js'
 
-/**
- * @param {{
- *  github: InstanceType<typeof import('@actions/github/lib/utils').GitHub>,
- *  context: typeof import('@actions/github').context,
- *  core: typeof import('@actions/core'),
- *  repoPath?: string,
- *  dry: boolean,
- * }} CheckManualFileEditsProps
- */
 export default async function checkManualFileEdits({
   github,
   context,
   core,
   repoPath,
   dry,
+}: {
+  github: InstanceType<typeof import('@actions/github/lib/utils').GitHub>
+  context: typeof import('@actions/github').context
+  core: typeof import('@actions/core')
+  repoPath?: string
+  dry: boolean
 }) {
   const reviewKey = 'manual-file-edits'
 

ci/github-script/run

@@ -123,7 +123,7 @@ program
   .argument('<repo>', 'Name of the GitHub repository to run on (Example: nixpkgs)')
   .argument('<pr>', 'Number of the Pull Request to run on')
   .action(async (owner, repo, pr, options) => {
-    const checkManualFileEdits = (await import('./manual-file-edits.js')).default
+    const checkManualFileEdits = (await import('./manual-file-edits.ts')).default
     await run(checkManualFileEdits, owner, repo, pr, options)
   })
 

pkgs/by-name/fl/flycast/package.nix

@@ -62,6 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "flycast";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tallesCoelho ];
   };
 })

pkgs/by-name/ki/kid3/package.nix

@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
         "kid3"
       else
         "kid3-cli";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tallesCoelho ];
     platforms = lib.platforms.linux;
   };
 })