Revert "addwater: 1.1.6 -> 1.2.2"

This reverts commit 027e561.

.github/workflows/codeowners-v2.yml

@@ -19,8 +19,6 @@ name: Codeowners v2
 #
 # This split is done because checking code owners requires handling untrusted PR input,
 # while requesting code owners requires PR write access, and those shouldn't be mixed.
-#
-# Note that the latter is also used for ./eval.yml requesting reviewers.
 
 on:
   pull_request_target:

.github/workflows/eval.yml

@@ -133,7 +133,6 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ needs.get-merge-commit.outputs.mergedSha }}
-          fetch-depth: 2
           path: nixpkgs
 
       - name: Install Nix
@@ -195,18 +194,12 @@ jobs:
       - name: Compare against the base branch
         if: steps.baseRunId.outputs.baseRunId
         run: |
-          git -C nixpkgs worktree add ../base ${{ needs.attrs.outputs.baseSha }}
-          git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} ${{ needs.attrs.outputs.mergedSha }} \
-            | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
-
-          # Use the base branch to get accurate maintainer info
-          nix-build base/ci -A eval.compare \
+          nix-build nixpkgs/ci -A eval.compare \
             --arg beforeResultDir ./baseResult \
             --arg afterResultDir ./prResult \
-            --arg touchedFilesJson ./touched-files.json \
             -o comparison
-
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
+          # TODO: Request reviews from maintainers for packages whose files are modified in the PR
 
       - name: Upload the combined results
         if: steps.baseRunId.outputs.baseRunId
@@ -219,41 +212,18 @@ jobs:
   tag:
     name: Tag
     runs-on: ubuntu-latest
-    needs: [ attrs, process ]
+    needs: process
     if: needs.process.outputs.baseRunId
     permissions:
       pull-requests: write
       statuses: write
     steps:
-      # See ./codeowners-v2.yml, reuse the same App because we need the same permissions
-      # Can't use the token received from permissions above, because it can't get enough permissions
-      - uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-
       - name: Download process result
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: comparison
           path: comparison
 
-      - name: Install Nix
-        uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
-
-      # Important: This workflow job runs with extra permissions,
-      # so we need to make sure to not run untrusted code from PRs
-      - name: Check out Nixpkgs at the base commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          ref: ${{ needs.attrs.outputs.baseSha }}
-          path: base
-          sparse-checkout: ci
-
-      - name: Build the requestReviews derivation
-        run: nix-build base/ci -A requestReviews
-
       - name: Tagging pull request
         run: |
           # Get all currently set rebuild labels
@@ -282,25 +252,10 @@ jobs:
               /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
               -f "labels[]=$toAdd"
           done < <(comm -13 before after)
-
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/process-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" \
-            > reviewers.json
-
-          # Request reviewers from maintainers of changed output paths
-          GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
-            --method POST \
-            /repos/"$REPOSITORY"/pulls/"$NUMBER"/requested_reviewers \
-            --input reviewers.json
-
         env:
           GH_TOKEN: ${{ github.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
-          AUTHOR: ${{ github.event.pull_request.user.login }}
 
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}

.github/workflows/no-channel.yml

@@ -1,17 +1,18 @@
 name: "No channel PR"
 
 on:
-  pull_request_target:
-    # Re-run should be triggered when the base branch is updated, instead of silently failing
-    types: [opened, synchronize, reopened, edited]
+  pull_request:
     branches:
       - 'nixos-**'
       - 'nixpkgs-**'
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   fail:
+    permissions:
+      contents: none
     name: "This PR is is targeting a channel branch"
     runs-on: ubuntu-latest
     steps:

.github/workflows/ofborg-pending.yml

@@ -0,0 +1,34 @@
+name: "Set pending OfBorg status"
+on:
+  pull_request_target:
+
+# Sets the ofborg-eval status to "pending" to signal that we are waiting for
+# OfBorg even if it is running late. The status will be overwritten by OfBorg
+# once it starts evaluation.
+
+# WARNING:
+# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to
+# the GitHub repository. This means that it should not evaluate user input in a
+# way that allows code injection.
+
+permissions:
+  contents: read
+
+jobs:
+  action:
+    name: set-ofborg-pending
+    if: github.repository_owner == 'NixOS'
+    permissions:
+      statuses: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Set pending OfBorg status"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        curl \
+          -X POST \
+          -H "Accept: application/vnd.github.v3+json" \
+          -H "Authorization: Bearer $GITHUB_TOKEN" \
+          -d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \
+          "https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses"

.github/workflows/periodic-merge-24h.yml

@@ -33,6 +33,12 @@ jobs:
       max-parallel: 1
       matrix:
         pairs:
+          - from: master
+            into: haskell-updates
+          - from: release-24.05
+            into: staging-next-24.05
+          - from: staging-next-24.05
+            into: staging-24.05
           - from: release-24.11
             into: staging-next-24.11
           - from: staging-next-24.11

.gitignore

@@ -33,7 +33,6 @@ __pycache__
 
 # generated by pkgs/common-updater/update-script.nix
 update-git-commits.txt
-/*.log
 
 # JetBrains IDEA module declaration file
 /nixpkgs.iml

.mailmap

@@ -10,9 +10,6 @@ Fiona Behrens <[email protected]>
 Fiona Behrens <[email protected]> <[email protected]>
 goatastronaut0212 <[email protected]> <[email protected]>
 Janne Heß <[email protected]> <[email protected]>
-jopejoe1 <[email protected]>
-jopejoe1 <[email protected]> <[email protected]>
-jopejoe1 <[email protected]> <[email protected]>
 Jörg Thalheim <[email protected]> <[email protected]>
 Lin Jian <[email protected]> <[email protected]>
 Lin Jian <[email protected]> <[email protected]>

COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2024 Eelco Dolstra and the Nixpkgs/NixOS contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

ci/eval/compare/default.nix

@@ -5,11 +5,7 @@
   writeText,
   ...
 }:
-{
-  beforeResultDir,
-  afterResultDir,
-  touchedFilesJson,
-}:
+{ beforeResultDir, afterResultDir }:
 let
   /*
     Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
@@ -81,11 +77,11 @@ let
   # - values: lists of `packagePlatformPath`s
   diffAttrs = diff beforeAttrs afterAttrs;
 
-  rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
-  rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
-
   changed-paths =
     let
+      rebuilds = uniqueStrings (diffAttrs.added ++ diffAttrs.changed);
+      rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
+
       rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
       rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
       rebuildCountByKernel = lib.mapAttrs (
@@ -100,34 +96,19 @@ let
           rebuildsByKernel
           rebuildCountByKernel
           ;
-        labels =
-          (getLabels rebuildCountByKernel)
-          # Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed
-          ++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") (
-            lib.filterAttrs (_: kernelRebuilds: kernelRebuilds ? "stdenv") rebuildsByKernel
-          );
+        labels = getLabels rebuildCountByKernel;
       }
     );
-
-  maintainers = import ./maintainers.nix {
-    changedattrs = lib.unique (map (a: a.packagePath) rebuildsPackagePlatformAttrs);
-    changedpathsjson = touchedFilesJson;
-  };
 in
 runCommand "compare"
   {
     nativeBuildInputs = [ jq ];
-    maintainers = builtins.toJSON maintainers;
-    passAsFile = [ "maintainers" ];
   }
   ''
     mkdir $out
 
     cp ${changed-paths} $out/changed-paths.json
 
     jq -r -f ${./generate-step-summary.jq} < ${changed-paths} > $out/step-summary.md
-
-    cp "$maintainersPath" "$out/maintainers.json"
-
     # TODO: Compare eval stats
   ''