commit 31372680c5a39bc329427d322ee22cb3a7a64bd7 · pyrox.dev/nixpkgs

+4 -7

.github/workflows/check-nix-format.yml .github/workflows/check-format.yml

···

       1
       1
       -
       # NOTE: Formatting with the RFC-style nixfmt command is not yet stable.

     

       2
       2
       -
       # See https://github.com/NixOS/rfcs/pull/166.

     

       3
       3
       -
       

     

       4
       4
       -
       name: Check that Nix files are formatted

     

       1
       1
       +
       name: Check that files are formatted

     

       5
       2
        
       

     

       6
       3
        
       on:

     

       7
       4
        
         pull_request_target:

     
···

       14
       11
        
           uses: ./.github/workflows/get-merge-commit.yml

     

       15
       12
        
       

     

       16
       13
        
         nixos:

     

       17
       17
       -
           name: nixfmt-check

     

       14
       14
       +
           name: fmt-check

     

       18
       15
        
           runs-on: ubuntu-24.04

     

       19
       16
        
           needs: get-merge-commit

     

       20
       17
        
           if: needs.get-merge-commit.outputs.mergedSha

     
···

       27
       24
        
               with:

     

       28
       25
        
                 extra_nix_config: sandbox = true

     

       29
       26
        
       

     

       30
       30
       -
             - name: Check that Nix files are formatted

     

       27
       27
       +
             - name: Check that files are formatted

     

       31
       28
        
               run: |

     

       32
       29
        
                 # Note that it's fine to run this on untrusted code because:

     

       33
       30
        
                 # - There's no secrets accessible here

     

       34
       31
        
                 # - The build is sandboxed

     

       35
       32
        
                 if ! nix-build ci -A fmt.check; then

     

       36
       36
       -
                   echo "Some Nix files are not properly formatted"

     

       33
       33
       +
                   echo "Some files are not properly formatted"

     

       37
       34
        
                   echo "Please format them by going to the Nixpkgs root directory and running one of:"

     

       38
       35
        
                   echo "  nix-shell --run treefmt"

     

       39
       36
        
                   echo "  nix develop --command treefmt"

-52

.github/workflows/editorconfig-v2.yml

···

       1
       1
       -
       name: "Checking EditorConfig v2"

     

       2
       2
       -
       

     

       3
       3
       -
       on:

     

       4
       4
       -
         pull_request_target:

     

       5
       5
       -
       

     

       6
       6
       -
       permissions: {}

     

       7
       7
       -
       

     

       8
       8
       -
       jobs:

     

       9
       9
       -
         get-merge-commit:

     

       10
       10
       -
           uses: ./.github/workflows/get-merge-commit.yml

     

       11
       11
       -
       

     

       12
       12
       -
         tests:

     

       13
       13
       -
           name: editorconfig-check

     

       14
       14
       -
           runs-on: ubuntu-24.04

     

       15
       15
       -
           needs: get-merge-commit

     

       16
       16
       -
           if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')"

     

       17
       17
       -
           steps:

     

       18
       18
       -
             - name: Get list of changed files from PR

     

       19
       19
       -
               env:

     

       20
       20
       -
                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

     

       21
       21
       -
               run: |

     

       22
       22
       -
                 gh api \

     

       23
       23
       -
                   repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \

     

       24
       24
       -
                   | jq '.[] | select(.status != "removed") | .filename' \

     

       25
       25
       -
                   > "$HOME/changed_files"

     

       26
       26
       -
       

     

       27
       27
       -
             - name: print list of changed files

     

       28
       28
       -
               run: |

     

       29
       29
       -
                 cat "$HOME/changed_files"

     

       30
       30
       -
       

     

       31
       31
       -
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       32
       32
       -
               with:

     

       33
       33
       -
                 ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

     

       34
       34
       -
       

     

       35
       35
       -
             - name: Get Nixpkgs revision for editorconfig-checker

     

       36
       36
       -
               run: |

     

       37
       37
       -
                 # Pin to a commit from nixpkgs-unstable to avoid building from e.g. staging.

     

       38
       38
       -
                 # This should not be a URL, because it would allow PRs to run arbitrary code in CI!

     

       39
       39
       -
                 rev=$(jq -r .rev ci/pinned-nixpkgs.json)

     

       40
       40
       -
                 echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"

     

       41
       41
       -
       

     

       42
       42
       -
             - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31

     

       43
       43
       -
               with:

     

       44
       44
       -
                 nix_path: nixpkgs=${{ env.url }}

     

       45
       45
       -
       

     

       46
       46
       -
             - name: Checking EditorConfig

     

       47
       47
       -
               run: |

     

       48
       48
       -
                 < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'

     

       49
       49
       -
       

     

       50
       50
       -
             - if: ${{ failure() }}

     

       51
       51
       -
               run: |

     

       52
       52
       -
                 echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."

-41

.github/workflows/keep-sorted.yml

···

       1
       1
       -
       name: Check that files are sorted

     

       2
       2
       -
       

     

       3
       3
       -
       on:

     

       4
       4
       -
         pull_request_target:

     

       5
       5
       -
           types: [opened, synchronize, reopened]

     

       6
       6
       -
       

     

       7
       7
       -
       permissions: {}

     

       8
       8
       -
       

     

       9
       9
       -
       jobs:

     

       10
       10
       -
         get-merge-commit:

     

       11
       11
       -
           uses: ./.github/workflows/get-merge-commit.yml

     

       12
       12
       -
       

     

       13
       13
       -
         nixos:

     

       14
       14
       -
           name: keep-sorted

     

       15
       15
       -
           runs-on: ubuntu-24.04

     

       16
       16
       -
           needs: get-merge-commit

     

       17
       17
       -
           if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')"

     

       18
       18
       -
           steps:

     

       19
       19
       -
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

     

       20
       20
       -
               with:

     

       21
       21
       -
                 ref: ${{ needs.get-merge-commit.outputs.mergedSha }}

     

       22
       22
       -
       

     

       23
       23
       -
             - name: Get Nixpkgs revision for keep-sorted

     

       24
       24
       -
               run: |

     

       25
       25
       -
                 # Pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt from staging.

     

       26
       26
       -
                 # This should not be a URL, because it would allow PRs to run arbitrary code in CI!

     

       27
       27
       -
                 rev=$(jq -r .rev ci/pinned-nixpkgs.json)

     

       28
       28
       -
                 echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"

     

       29
       29
       -
       

     

       30
       30
       -
             - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31

     

       31
       31
       -
               with:

     

       32
       32
       -
                 extra_nix_config: sandbox = true

     

       33
       33
       -
                 nix_path: nixpkgs=${{ env.url }}

     

       34
       34
       -
       

     

       35
       35
       -
             - name: Install keep-sorted

     

       36
       36
       -
               run: "nix-env -f '<nixpkgs>' -iAP keep-sorted jq"

     

       37
       37
       -
       

     

       38
       38
       -
             - name: Check that Nix files are sorted

     

       39
       39
       -
               shell: bash

     

       40
       40
       -
               run: |

     

       41
       41
       -
                 git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."'

+1 -1

ci/OWNERS

···

       16
       16
        
       # CI

     

       17
       17
        
       /.github/*_TEMPLATE*                    @SigmaSquadron

     

       18
       18
        
       /.github/workflows                      @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther

     

       19
       19
       -
       /.github/workflows/check-nix-format.yml @infinisil @wolfgangwalther

     

       19
       19
       +
       /.github/workflows/check-format.yml     @infinisil @wolfgangwalther

     

       20
       20
        
       /.github/workflows/codeowners-v2.yml    @infinisil @wolfgangwalther

     

       21
       21
        
       /.github/workflows/nixpkgs-vet.yml      @infinisil @philiptaron @wolfgangwalther

     

       22
       22
        
       /ci                                     @infinisil @philiptaron @NixOS/Security @wolfgangwalther

ci/default.nix

···

       44
       44
        
               # By default it's info, which is too noisy since we have many unmatched files

     

       45
       45
        
               settings.on-unmatched = "debug";

     

       46
       46
        
       

     

       47
       47
       +
               programs.keep-sorted.enable = true;

     

       48
       48
       +
       

     

       47
       49
        
               # This uses nixfmt-rfc-style underneath,

     

       48
       50
        
               # the default formatter for Nix code.

     

       49
       51
        
               # See https://github.com/NixOS/nixfmt

     

       50
       52
        
               programs.nixfmt.enable = true;

     

       53
       53
       +
       

     

       54
       54
       +
               settings.formatter.editorconfig-checker = {

     

       55
       55
       +
                 command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";

     

       56
       56
       +
                 options = [ "-disable-indent-size" ];

     

       57
       57
       +
                 includes = [ "*" ];

     

       58
       58
       +
                 priority = 1;

     

       59
       59
       +
               };

     

       51
       60
        
             };

     

       52
       61
        
             fs = pkgs.lib.fileset;

     

       53
       62
        
             nixFilesSrc = fs.toSource {