Skip to content

Commit 889ec76

Browse files
Merge master into staging-nixos
2 parents a0703a7 + 864b51e commit 889ec76

File tree

91 files changed

+3601
-1718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3601
-1718
lines changed

.github/workflows/backport.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
# Use a GitHub App to create the PR so that CI gets triggered
2929
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
30-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
30+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3131
id: app-token
3232
with:
3333
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
@@ -36,7 +36,7 @@ jobs:
3636
permission-pull-requests: write
3737
permission-workflows: write
3838

39-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
39+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4040
with:
4141
ref: ${{ github.event.pull_request.head.sha }}
4242
token: ${{ steps.app-token.outputs.token }}

.github/workflows/bot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
4747
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
4848
steps:
49-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
49+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5050
with:
5151
persist-credentials: false
5252
sparse-checkout: |
@@ -56,7 +56,7 @@ jobs:
5656
run: npm install @actions/artifact bottleneck
5757

5858
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
59-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
59+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
6060
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
6161
id: app-token
6262
with:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ${{ matrix.runner }}
5353
timeout-minutes: 60
5454
steps:
55-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
55+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5656
with:
5757
persist-credentials: false
5858
sparse-checkout: .github/actions

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-slim
3636
timeout-minutes: 3
3737
steps:
38-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
38+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3939
with:
4040
persist-credentials: false
4141
path: trusted
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-24.04-arm
7676
timeout-minutes: 5
7777
steps:
78-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
78+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7979
with:
8080
persist-credentials: false
8181
sparse-checkout: .github/actions

.github/workflows/comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
timeout-minutes: 2
2424
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
2525
steps:
26-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
26+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2727
with:
2828
persist-credentials: false
2929
sparse-checkout: |
3030
ci/github-script
3131
3232
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
33-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
33+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3434
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
3535
id: app-token
3636
with:

.github/workflows/edited.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# Use a GitHub App to create the PR so that CI gets triggered
3737
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
3838
# We only need Pull Requests: write here, but the app is also used for backports.
39-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
39+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
4040
id: app-token
4141
with:
4242
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}

.github/workflows/eval.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ jobs:
3737
outputs:
3838
versions: ${{ steps.versions.outputs.versions }}
3939
steps:
40-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
40+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4141
with:
4242
persist-credentials: false
4343
path: trusted
4444
sparse-checkout: |
4545
ci/supportedVersions.nix
4646
4747
- name: Check out the PR at the test merge commit
48-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
48+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4949
with:
5050
persist-credentials: false
5151
ref: ${{ inputs.mergedSha }}
@@ -89,7 +89,7 @@ jobs:
8989
sudo mkswap /swap
9090
sudo swapon /swap
9191
92-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
92+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9393
with:
9494
persist-credentials: false
9595
sparse-checkout: .github/actions
@@ -171,7 +171,7 @@ jobs:
171171
statuses: write
172172
timeout-minutes: 5
173173
steps:
174-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
174+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
175175
with:
176176
persist-credentials: false
177177
sparse-checkout: .github/actions
@@ -342,7 +342,7 @@ jobs:
342342
runs-on: ubuntu-24.04-arm
343343
timeout-minutes: 10
344344
steps:
345-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
345+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
346346
with:
347347
persist-credentials: false
348348
sparse-checkout: .github/actions

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-24.04-arm
2727
timeout-minutes: 10
2828
steps:
29-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
29+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3030
with:
3131
persist-credentials: false
3232
sparse-checkout: .github/actions
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-24.04-arm
6262
timeout-minutes: 10
6363
steps:
64-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
64+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6565
with:
6666
persist-credentials: false
6767
sparse-checkout: .github/actions
@@ -90,7 +90,7 @@ jobs:
9090
runs-on: ubuntu-24.04-arm
9191
timeout-minutes: 10
9292
steps:
93-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
93+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9494
with:
9595
persist-credentials: false
9696
sparse-checkout: .github/actions

.github/workflows/merge-group.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
targetSha: ${{ steps.prepare.outputs.targetSha }}
2626
systems: ${{ steps.prepare.outputs.systems }}
2727
steps:
28-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
28+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2929
with:
3030
persist-credentials: false
3131
sparse-checkout: |

.github/workflows/periodic-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
steps:
2727
# Use a GitHub App to create the PR so that CI gets triggered
2828
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
29-
- uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
29+
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3030
id: app-token
3131
with:
3232
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
3333
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
3434
permission-contents: write
3535
permission-pull-requests: write
3636

37-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
37+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3838
with:
3939
persist-credentials: false
4040

0 commit comments

Comments
 (0)