Commit 1d16f334 authored by K900's avatar K900
Browse files

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

parents 5a520c64 c285cd43

.github/workflows/backport.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs: 
    steps:

      # Use a GitHub App to create the PR so that CI gets triggered

      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs

      - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3

      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5

        id: app-token

        with:

          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

.github/workflows/codeowners-v2.yml

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ jobs: 
      - name: Build codeowners validator

        run: nix-build base/ci -A codeownersValidator



      - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3

      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5

        id: app-token

        with:

          app-id: ${{ vars.OWNER_RO_APP_ID }}
@@ -96,7 +96,7 @@ jobs: 
      # This is intentional, because we need to request the review of owners as declared in the base branch.

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2



      - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3

      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5

        id: app-token

        with:

          app-id: ${{ vars.OWNER_APP_ID }}

.github/workflows/eval.yml

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ jobs: 
    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@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3

      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5

        id: app-token

        with:

          app-id: ${{ vars.OWNER_APP_ID }}

.github/workflows/periodic-merge.yml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ jobs: 
    steps:

      # Use a GitHub App to create the PR so that CI gets triggered

      # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs

      - uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3

      - uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5

        id: app-token

        with:

          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

ci/OWNERS

+6 −0
Original line number Diff line number Diff line
@@ -443,3 +443,9 @@ pkgs/by-name/lx/lxc* @adamcstephens 
/pkgs/by-name/ap/apple-sdk                     @NixOS/darwin-core

/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core

/pkgs/stdenv/darwin                            @NixOS/darwin-core



# BEAM

pkgs/development/beam-modules/          @NixOS/beam

pkgs/development/interpreters/erlang/   @NixOS/beam

pkgs/development/interpreters/elixir/   @NixOS/beam

pkgs/development/interpreters/lfe/      @NixOS/beam