Unverified Commit 14ffe0e2 authored by Sam Grayson's avatar Sam Grayson Committed by GitHub
Browse files

Merge branch 'NixOS:master' into patch-1

parents da32d38b 77ed358e
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@
# Libraries
/lib                        @edolstra @infinisil
/lib/systems                @alyssais @ericson2314 @amjoseph-nixpkgs
/lib/generators.nix         @edolstra @Profpatsch
/lib/cli.nix                @edolstra @Profpatsch
/lib/debug.nix              @edolstra @Profpatsch
/lib/asserts.nix            @edolstra @Profpatsch
/lib/generators.nix         @infinisil @edolstra @Profpatsch
/lib/cli.nix                @infinisil @edolstra @Profpatsch
/lib/debug.nix              @infinisil @edolstra @Profpatsch
/lib/asserts.nix            @infinisil @edolstra @Profpatsch
/lib/path.*                 @infinisil @fricklerhandwerk
/lib/fileset                @infinisil
/doc/functions/fileset.section.md @infinisil
@@ -53,7 +53,7 @@
/pkgs/test/nixpkgs-check-by-name @infinisil
/pkgs/by-name/README.md @infinisil
/pkgs/top-level/by-name-overlay.nix @infinisil
/.github/workflows/check-by-name.nix @infinisil
/.github/workflows/check-by-name.yml @infinisil

# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ For new packages please briefly describe the package or provide a link to its ho
  - [ ] aarch64-linux
  - [ ] x86_64-darwin
  - [ ] aarch64-darwin
- [ ] For non-Linux: Is `sandbox = true` set in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))
- For non-Linux: Is sandboxing enabled in `nix.conf`? (See [Nix manual](https://nixos.org/manual/nix/stable/command-ref/conf-file.html))
  - [ ] `sandbox = relaxed`
  - [ ] `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)
+26 −4
Original line number Diff line number Diff line
@@ -18,12 +18,34 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Resolving the merge commit
        env:
          GH_TOKEN: ${{ github.token }}
        run: |
          if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then
            mergedSha=$(cut -f1 <<< "$result")
            echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha"
          # This checks for mergeability of a pull request as recommended in
          # 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
          while true; do
            echo "Checking whether the pull request can be merged"
            prInfo=$(gh api \
              -H "Accept: application/vnd.github+json" \
              -H "X-GitHub-Api-Version: 2022-11-28" \
              /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }})
            mergeable=$(jq -r .mergeable <<< "$prInfo")
            mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo")

            if [[ "$mergeable" == "null" ]]; then
              # null indicates that GitHub is still computing whether it's mergeable
              # Wait a couple seconds before trying again
              echo "GitHub is still computing whether this PR can be merged, waiting 5 seconds before trying again"
              sleep 5
            else
              break
            fi
          done

          if [[ "$mergeable" == "true" ]]; then
            echo "The PR can be merged, checking the merge commit $mergedSha"
          else
            echo "The PR may have a merge conflict"
            echo "The PR cannot be merged, it has a merge conflict"
            exit 1
          fi
          echo "mergedSha=$mergedSha" >> "$GITHUB_ENV"
+2 −2
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ To get a sense for what changes are considered mass rebuilds, see [previously me
  When adding yourself as maintainer, in the same pull request, make a separate
  commit with the message `maintainers: add <handle>`.
  Add the commit before those making changes to the package or module.
  See [Nixpkgs Maintainers](../maintainers/README.md) for details.
  See [Nixpkgs Maintainers](./maintainers/README.md) for details.

### Writing good commit messages

@@ -565,7 +565,7 @@ Names of files and directories should be in lowercase, with dashes between words

- Do not use tab characters, i.e. configure your editor to use soft tabs. For instance, use `(setq-default indent-tabs-mode nil)` in Emacs. Everybody has different tab settings so it’s asking for trouble.

- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [](#sec-package-naming).
- Use `lowerCamelCase` for variable names, not `UpperCamelCase`. Note, this rule does not apply to package attribute names, which instead follow the rules in [package naming](./pkgs/README.md#package-naming).

- Function calls with attribute set arguments are written as

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
This directory houses the sources files for the Nixpkgs manual.

You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/).
The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`.

[Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available.

Loading