diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/.github | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/.github')
-rw-r--r-- | nixpkgs/.github/CODEOWNERS | 46 | ||||
-rw-r--r-- | nixpkgs/.github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
-rw-r--r-- | nixpkgs/.github/labeler.yml | 14 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/backport.yml | 4 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/basic-eval.yml | 4 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/check-by-name.yml | 15 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/check-cherry-picks.yml | 24 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/check-maintainers-sorted.yaml | 6 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/check-nix-format.yml | 54 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/editorconfig.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/manual-nixos.yml | 4 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/manual-nixpkgs.yml | 5 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/nix-parse.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/periodic-merge-24h.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/periodic-merge-6h.yml | 2 | ||||
-rw-r--r-- | nixpkgs/.github/workflows/update-terraform-providers.yml | 4 |
16 files changed, 153 insertions, 37 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index 352212ba5100..109b64d7392a 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -13,7 +13,6 @@ # GitHub actions /.github/workflows @NixOS/Security @Mic92 @zowoq -/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq @@ -55,7 +54,7 @@ /pkgs/pkgs-lib/formats/hocon @h7x4 # pkgs/by-name -/pkgs/test/nixpkgs-check-by-name @infinisil +/pkgs/test/check-by-name @infinisil /pkgs/by-name/README.md @infinisil /pkgs/top-level/by-name-overlay.nix @infinisil /.github/workflows/check-by-name.yml @infinisil @@ -125,10 +124,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 /pkgs/common-updater/scripts/update-source-version @jtojnar # Python-related code and docs -/maintainers/scripts/update-python-libraries @FRidh -/pkgs/development/interpreters/python @FRidh -/doc/languages-frameworks/python.section.md @FRidh @mweinelt -/pkgs/development/interpreters/python/hooks @FRidh @jonringer +/doc/languages-frameworks/python.section.md @mweinelt +/pkgs/development/interpreters/python/hooks @jonringer # Haskell /doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @ncfavier @@ -148,10 +145,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 /pkgs/applications/science/math/R @jbedo /pkgs/development/r-modules @jbedo -# Ruby -/pkgs/development/interpreters/ruby @marsam -/pkgs/development/ruby-modules @marsam - # Rust /pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda /pkgs/build-support/rust @zowoq @winterqt @figsoda @@ -185,20 +178,20 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /lib/licenses.nix @alyssais # Qt -/pkgs/development/libraries/qt-5 @NixOS/qt-kde -/pkgs/development/libraries/qt-6 @NixOS/qt-kde +/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel # KDE / Plasma 5 -/pkgs/applications/kde @NixOS/qt-kde -/pkgs/desktops/plasma-5 @NixOS/qt-kde -/pkgs/development/libraries/kde-frameworks @NixOS/qt-kde +/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel +/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel # KDE / Plasma 6 -/pkgs/kde @NixOS/qt-kde -/maintainers/scripts/kde @NixOS/qt-kde +/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel +/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff -/pkgs/servers/sql/postgresql @thoughtpolice @marsam +/pkgs/servers/sql/postgresql @thoughtpolice /nixos/modules/services/databases/postgresql.xml @thoughtpolice /nixos/modules/services/databases/postgresql.nix @thoughtpolice /nixos/tests/postgresql.nix @thoughtpolice @@ -232,10 +225,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/modules/services/networking/babeld.nix @mweinelt /nixos/modules/services/networking/kea.nix @mweinelt /nixos/modules/services/networking/knot.nix @mweinelt +nixos/modules/services/networking/networkmanager.nix @Janik-Haag /nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt /nixos/tests/babeld.nix @mweinelt /nixos/tests/kea.nix @mweinelt /nixos/tests/knot.nix @mweinelt +/nixos/tests/networking/* @Janik-Haag # Web servers /doc/packages/nginx.section.md @raitobezarius @@ -296,7 +291,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # GNOME /pkgs/desktops/gnome @jtojnar -/pkgs/desktops/gnome/extensions @piegamesde @jtojnar +/pkgs/desktops/gnome/extensions @jtojnar /pkgs/build-support/make-hardcode-gsettings-patch @jtojnar # Cinnamon @@ -359,3 +354,16 @@ pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq pkgs/by-name/pr/pretix/ @mweinelt nixos/modules/services/web-apps/pretix.nix @mweinelt nixos/tests/web-apps/pretix.nix @mweinelt + +# incus/lxc/lxd +nixos/maintainers/scripts/lxd/ @adamcstephens +nixos/modules/virtualisation/incus.nix @adamcstephens +nixos/modules/virtualisation/lxc* @adamcstephens +nixos/modules/virtualisation/lxd* @adamcstephens +nixos/tests/incus/ @adamcstephens +nixos/tests/lxd/ @adamcstephens +pkgs/by-name/in/incus/ @adamcstephens +pkgs/by-name/lx/lxc* @adamcstephens +pkgs/by-name/lx/lxd* @adamcstephens +pkgs/os-specific/linux/lxc/ @adamcstephens + diff --git a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md index 1dfd8cd15abd..7b68fbd77b74 100644 --- a/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md +++ b/nixpkgs/.github/PULL_REQUEST_TEMPLATE.md @@ -19,7 +19,7 @@ For new packages please briefly describe the package or provide a link to its ho - [ ] `sandbox = true` - [ ] Tested, as applicable: - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - - and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) + - and/or [package tests](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests) - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test) - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) diff --git a/nixpkgs/.github/labeler.yml b/nixpkgs/.github/labeler.yml index a6e8d734382e..b88f7f5179ec 100644 --- a/nixpkgs/.github/labeler.yml +++ b/nixpkgs/.github/labeler.yml @@ -95,6 +95,14 @@ - pkgs/top-level/haskell-packages.nix - pkgs/top-level/release-haskell.nix +"6.topic: julia": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/julia.section.md + - pkgs/development/compilers/julia/**/* + - pkgs/development/julia-modules/**/* + "6.topic: jupyter": - any: - changed-files: @@ -122,6 +130,7 @@ - any: - changed-files: - any-glob-to-any-file: + - pkgs/development/tools/misc/luarocks/* - pkgs/development/interpreters/lua-5/**/* - pkgs/development/interpreters/luajit/**/* - pkgs/development/lua-modules/**/* @@ -360,3 +369,8 @@ - changed-files: - any-glob-to-any-file: - nixos/modules/**/* +"8.has: maintainer-list (update)": + - any: + - changed-files: + - any-glob-to-any-file: + - maintainers/maintainer-list.nix diff --git a/nixpkgs/.github/workflows/backport.yml b/nixpkgs/.github/workflows/backport.yml index 3a93eb4fd624..7a168d14a479 100644 --- a/nixpkgs/.github/workflows/backport.yml +++ b/nixpkgs/.github/workflows/backport.yml @@ -20,11 +20,11 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@e8161d6a0dbfa2651b7daa76cbb75bc7c925bbf3 # v2.4.1 + uses: korthout/backport-action@ef20d86abccbac3ee3a73cb2efbdc06344c390e5 # v2.5.0 with: # Config README: https://github.com/korthout/backport-action#backport-action copy_labels_pattern: 'severity:\ssecurity' diff --git a/nixpkgs/.github/workflows/basic-eval.yml b/nixpkgs/.github/workflows/basic-eval.yml index 9008ca208e17..6059ba784959 100644 --- a/nixpkgs/.github/workflows/basic-eval.yml +++ b/nixpkgs/.github/workflows/basic-eval.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14 with: @@ -26,4 +26,4 @@ jobs: name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' + - run: nix-build pkgs/top-level/release.nix -A release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/nixpkgs/.github/workflows/check-by-name.yml b/nixpkgs/.github/workflows/check-by-name.yml index bdc223e3d32c..8e2011cb6d52 100644 --- a/nixpkgs/.github/workflows/check-by-name.yml +++ b/nixpkgs/.github/workflows/check-by-name.yml @@ -20,6 +20,13 @@ permissions: # We need this permission to cancel the workflow run if there's a merge conflict actions: write +# Create a check-by-name concurrency group based on the pull request number. if +# an event triggers a run on the same PR while a previous run is still in +# progress, the previous run will be canceled and the new one will start. +concurrency: + group: check-by-name-${{ github.event.pull_request.number }} + cancel-in-progress: true + jobs: check: # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases @@ -39,7 +46,7 @@ jobs: # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests # Retry the API query this many times - retryCount=3 + retryCount=5 # Start with 5 seconds, but double every retry retryInterval=5 while true; do @@ -84,7 +91,7 @@ jobs: exit 1 fi echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: ${{ env.mergedSha }} @@ -107,6 +114,10 @@ jobs: # Adds a result symlink as a GC root nix-store --realise "$toolPath" --add-root result - name: Running nixpkgs-check-by-name + env: + # Force terminal colors to be enabled. The library that + # nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/ + CLICOLOR_FORCE: 1 run: | if result/bin/nixpkgs-check-by-name --base "$base" .; then exit 0 diff --git a/nixpkgs/.github/workflows/check-cherry-picks.yml b/nixpkgs/.github/workflows/check-cherry-picks.yml new file mode 100644 index 000000000000..f8d244594165 --- /dev/null +++ b/nixpkgs/.github/workflows/check-cherry-picks.yml @@ -0,0 +1,24 @@ +name: "Check cherry-picks" +on: + pull_request_target: + branches: + - 'release-**' + - 'staging-**' + +permissions: {} + +jobs: + check: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + steps: + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + with: + fetch-depth: 0 + filter: blob:none + - name: Check cherry-picks + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + run: | + ./maintainers/scripts/check-cherry-picks.sh "$BASE_SHA" "$HEAD_SHA" diff --git a/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index eb7d22ea66bb..062522928c2a 100644 --- a/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -12,10 +12,14 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge + # Only these directories to perform the check + sparse-checkout: | + lib + maintainers - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: # explicitly enable sandbox diff --git a/nixpkgs/.github/workflows/check-nix-format.yml b/nixpkgs/.github/workflows/check-nix-format.yml new file mode 100644 index 000000000000..5e30762821ea --- /dev/null +++ b/nixpkgs/.github/workflows/check-nix-format.yml @@ -0,0 +1,54 @@ +# This file was copied mostly from check-maintainers-sorted.yaml. +# NOTE: Formatting with the RFC-style nixfmt command is not yet stable. See +# https://github.com/NixOS/rfcs/pull/166. +# Because of this, this action is not yet enabled for all files -- only for +# those who have opted in. +name: Check that Nix files are formatted + +on: + pull_request_target: +permissions: + contents: read + +jobs: + nixos: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + steps: + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + 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@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + # fix a commit from nixpkgs-unstable to avoid e.g. building nixfmt + # from staging + nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/4b455dc2048f73a79eb3713f342369ff58f93e0b.tar.gz + - name: Install nixfmt + run: "nix-env -f '<nixpkgs>' -iAP nixfmt-rfc-style" + - name: Check that Nix files are formatted according to the RFC style + # Each environment variable beginning with NIX_FMT_PATHS_ is a list of + # paths to check with nixfmt. + env: + # Format paths related to the Nixpkgs CUDA ecosystem. + NIX_FMT_PATHS_CUDA: | + pkgs/development/cuda-modules + pkgs/test/cuda + pkgs/top-level/cuda-packages.nix + NIX_FMT_PATHS_VSCODE_EXTS: pkgs/applications/editors/vscode/extensions + # Iterate over all environment variables beginning with NIX_FMT_PATHS_. + run: | + for env_var in "${!NIX_FMT_PATHS_@}"; do + readarray -t paths <<< "${!env_var}" + if [[ "${paths[*]}" == "" ]]; then + echo "Error: $env_var is empty." + exit 1 + fi + echo "Checking paths: ${paths[@]}" + if ! nixfmt --check "${paths[@]}"; then + echo "Error: nixfmt failed." + exit 1 + fi + done diff --git a/nixpkgs/.github/workflows/editorconfig.yml b/nixpkgs/.github/workflows/editorconfig.yml index 168e5bccaea4..bb864ace316b 100644 --- a/nixpkgs/.github/workflows/editorconfig.yml +++ b/nixpkgs/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/nixpkgs/.github/workflows/manual-nixos.yml b/nixpkgs/.github/workflows/manual-nixos.yml index 545f0c95c47b..ac5532a25370 100644 --- a/nixpkgs/.github/workflows/manual-nixos.yml +++ b/nixpkgs/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -26,6 +26,6 @@ jobs: with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Building NixOS manual run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux diff --git a/nixpkgs/.github/workflows/manual-nixpkgs.yml b/nixpkgs/.github/workflows/manual-nixpkgs.yml index 9d675c385feb..672ebf61ac77 100644 --- a/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -9,13 +9,14 @@ on: paths: - 'doc/**' - 'lib/**' + - 'pkgs/tools/nix/nixdoc/**' jobs: nixpkgs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -27,6 +28,6 @@ jobs: with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Building Nixpkgs manual run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true pkgs/top-level/release.nix -A manual -A manual.tests diff --git a/nixpkgs/.github/workflows/nix-parse.yml b/nixpkgs/.github/workflows/nix-parse.yml index da2e942414e2..b86594e0d53b 100644 --- a/nixpkgs/.github/workflows/nix-parse.yml +++ b/nixpkgs/.github/workflows/nix-parse.yml @@ -24,7 +24,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/nixpkgs/.github/workflows/periodic-merge-24h.yml b/nixpkgs/.github/workflows/periodic-merge-24h.yml index 6adada59c5a5..d9ad593618ae 100644 --- a/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -41,7 +41,7 @@ jobs: into: staging-23.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/nixpkgs/.github/workflows/periodic-merge-6h.yml b/nixpkgs/.github/workflows/periodic-merge-6h.yml index 6f188ee28d17..a3131e802534 100644 --- a/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/nixpkgs/.github/workflows/update-terraform-providers.yml b/nixpkgs/.github/workflows/update-terraform-providers.yml index 9b7ec5cc59b0..36d84d617dc4 100644 --- a/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -16,7 +16,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixpkgs-unstable @@ -46,7 +46,7 @@ jobs: run: | git clean -f - name: create PR - uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2 + uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83 # v6.0.4 with: body: | Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. |