Unverified Commit 795747cb authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

Merge staging-next into staging

parents 2f36301c 45e2b621

.github/workflows/eval.yml

+0 −2
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ jobs: 


      - name: Compare against the target branch

        env:

          AUTHOR_ID: ${{ github.event.pull_request.user.id }}

          TARGET_SHA: ${{ inputs.mergedSha }}

        run: |

          git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
@@ -212,7 +211,6 @@ jobs: 
          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \

            --arg combinedDir ./combined \

            --arg touchedFilesJson ./touched-files.json \

            --argstr githubAuthorId "$AUTHOR_ID" \

            --out-link comparison



          cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"

.github/workflows/labels.yml

+0 −4
Original line number Diff line number Diff line
@@ -39,10 +39,6 @@ jobs: 
  update:

    runs-on: ubuntu-24.04-arm

    if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'

    env:

      # TODO: Remove after 2026-03-04, when Node 24 becomes the default.

      # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/

      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"

    steps:

      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

        with:

ci/eval/compare/default.nix

+15 −14
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ in 
{

  combinedDir,

  touchedFilesJson,

  githubAuthorId,

}:

let

  # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
@@ -155,22 +154,19 @@ let 
                # Only set this label when no other label with indication for staging has been set.

                # This avoids confusion whether to target staging or batch this with kernel updates.

                lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;

            # Set the "11.by: package-maintainer" label to whether all packages directly

            # changed are maintained by the PR's author.

            "11.by: package-maintainer" =

              maintainers ? ${githubAuthorId}

              && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (

                lib.flatten (lib.attrValues maintainers)

              );

          };

      }

    );



  maintainers = callPackage ./maintainers.nix { } {

  inherit

    (callPackage ./maintainers.nix { } {

      changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);

      changedpathsjson = touchedFilesJson;

      removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);

  };

    })

    maintainers

    packages

    ;

in

runCommand "compare"

  {
@@ -180,7 +176,11 @@ runCommand "compare" 
      cmp-stats

    ];

    maintainers = builtins.toJSON maintainers;

    passAsFile = [ "maintainers" ];

    packages = builtins.toJSON packages;

    passAsFile = [

      "maintainers"

      "packages"

    ];

  }

  ''

    mkdir $out
@@ -223,4 +223,5 @@ runCommand "compare" 
    fi



    cp "$maintainersPath" "$out/maintainers.json"

    cp "$packagesPath" "$out/packages.json"

  ''

ci/eval/compare/maintainers.nix

+5 −5
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ let 
  ) attrsWithModifiedFiles;



  byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;



  packagesPerMaintainer = lib.mapAttrs (

    maintainer: packages: map (pkg: pkg.packageName) packages

  ) byMaintainer;

in

packagesPerMaintainer
 
{

  maintainers = lib.mapAttrs (_: lib.catAttrs "packageName") byMaintainer;



  packages = lib.catAttrs "packageName" listToPing;

}

ci/eval/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -281,9 +281,6 @@ let 
      # Whether to evaluate on a specific set of systems, by default all are evaluated

      evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,

      baseline,

      # Which maintainer should be considered the author?

      # Defaults to nixpkgs-ci which is not a maintainer and skips the check.

      githubAuthorId ? "nixpkgs-ci",

      # What files have been touched? Defaults to none; use the expression below to calculate it.

      # ```

      # git diff --name-only --merge-base master HEAD \
@@ -307,7 +304,7 @@ let 
      };

      comparisonReport = compare {

        combinedDir = combine { diffDir = diffs; };

        inherit touchedFilesJson githubAuthorId;

        inherit touchedFilesJson;

      };

    in

    comparisonReport;