Unverified Commit 7f5518dd authored by Brian Napolitano's avatar Brian Napolitano Committed by GitHub
Browse files

Merge branch 'NixOS:master' into master

parents 89e27b75 3ed7049c

.github/CODEOWNERS

+1 −5
Original line number Diff line number Diff line
@@ -148,10 +148,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
@@ -198,7 +194,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/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

.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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2

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

        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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2

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

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

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

      with:

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

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

        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

.github/workflows/check-cherry-picks.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ jobs: 
    runs-on: ubuntu-latest

    if: github.repository_owner == 'NixOS'

    steps:

    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

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

      with:

        fetch-depth: 0

        filter: blob:none