Merge master into staging-next

NixOS · Jan 18, 2024 · dc4a7c9 · dc4a7c9
2 parents 5d5d432 + 3df632c
commit dc4a7c9
Show file tree

Hide file tree

Showing 102 changed files with 1,828 additions and 561 deletions.
diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml
@@ -19,8 +19,8 @@ jobs:
  # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
  steps:
  - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
- - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
+ - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
  with:
  # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
  name: nixpkgs-ci

diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml
@@ -90,7 +90,7 @@ jobs:
  base=$(mktemp -d)
  git worktree add "$base" "$(git rev-parse HEAD^1)"
  echo "base=$base" >> "$GITHUB_ENV"
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  - name: Fetching the pinned tool
  # Update the pinned version using pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh
  run: |

diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml
@@ -16,7 +16,7 @@ jobs:
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  # explicitly enable sandbox
  extra_nix_config: sandbox = true

diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
@@ -28,7 +28,7 @@ jobs:
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  # nixpkgs commit is pinned so that it doesn't break
  # editorconfig-checker 2.4.0

diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml
@@ -18,11 +18,11 @@ jobs:
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  # explicitly enable sandbox
  extra_nix_config: sandbox = true
- - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+ - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
  with:
  # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
  name: nixpkgs-ci

diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml
@@ -19,11 +19,11 @@ jobs:
  with:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  # explicitly enable sandbox
  extra_nix_config: sandbox = true
- - uses: cachix/cachix-action@6a2e08b5ebf7a9f285ff57b1870a4262b06e0bee # v13
+ - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
  with:
  # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
  name: nixpkgs-ci

diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml
@@ -29,7 +29,7 @@ jobs:
  # pull_request_target checks out the base branch by default
  ref: refs/pull/${{ github.event.pull_request.number }}/merge
  if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  nix_path: nixpkgs=channel:nixpkgs-unstable
  - name: Parse all changed or added nix files

diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
@@ -17,7 +17,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
+ - uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
  with:
  nix_path: nixpkgs=channel:nixpkgs-unstable
  - name: setup