Unverified Commit 8554713d authored by Brian Napolitano's avatar Brian Napolitano Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 7f5518dd 38c01297

.github/CODEOWNERS

+2 −5
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


# GitHub actions

/.github/workflows @NixOS/Security @Mic92 @zowoq

/.github/workflows/merge-staging @FRidh



# EditorConfig

/.editorconfig @Mic92 @zowoq
@@ -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

.github/labeler.yml

+5 −0
Original line number Diff line number Diff line
@@ -369,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

.github/workflows/backport.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3

      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

        with:

          ref: ${{ github.event.pull_request.head.sha }}

      - name: Create backport PRs

.github/workflows/basic-eval.yml

+1 −1
Original line number Diff line number Diff line
@@ -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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3

    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

    - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26

    - uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14

      with:

.github/workflows/check-by-name.yml

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ jobs: 
            exit 1

          fi

          echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"

      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3

      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

        with:

          # pull_request_target checks out the base branch by default

          ref: ${{ env.mergedSha }}