Skip to content

Commit

Permalink
Merge pull request #1325 from l0b0/feat/sort-override-build-systems-m…
Browse files Browse the repository at this point in the history
…ore-strictly

feat: Sort override build systems more strictly
  • Loading branch information
cpcloud authored Oct 5, 2023
2 parents 093383b + d5ea9cd commit 8420c5b
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
nix_path: nixpkgs=channel:nixos-unstable
- uses: actions/checkout@v3
- name: Check format
run: nix-shell --packages jq --pure --run 'diff overrides/build-systems.json <(jq --raw-output --sort-keys < overrides/build-systems.json)'
run: nix-shell --packages jq --pure --run 'diff --unified overrides/build-systems.json <(jq --from-file overrides/sort-build-systems.jq --raw-output --sort-keys < overrides/build-systems.json)'

nixpkgs-fmt:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,8 @@ To test with a specific channel:
nix-build --expr 'with import <unstable> {}; callPackage ./tests/default.nix {}'
```

To sort `overrides/build-systems.json` according to the [`sort-build-systems` job](.github/workflows/ci.yml), patch the source with the output of the "Check format" step, like this: `nix-shell [omitted] | patch -p0`.

## Contact
We have a Matrix room at [#poetry2nix:blad.is](https://matrix.to/#/#poetry2nix:blad.is).

Expand Down
Loading

0 comments on commit 8420c5b

Please sign in to comment.