Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05d27ba19b6b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b5c6c8a58a1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 10, 2020

  1. .github/workflows/editorconfig.yml: check indent_style

    @zowoq
    zowoq committed Nov 10, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 226A2D41EF5378C9
    Learn about vigilant mode
    Copy the full SHA
    6521951 View commit details

  2. .editorconfig: indent_style excludes

    @zowoq
    zowoq committed Nov 10, 2020
    Copy the full SHA
    7e33f0e View commit details

  3. .github/workflows/editorconfig.yml: disable for release branches

    @zowoq
    zowoq committed Nov 10, 2020
    Copy the full SHA
    4b5c6c8 View commit details
Showing with 8 additions and 1 deletion.
  1. +5 −0 .editorconfig
  2. +3 −1 .github/workflows/editorconfig.yml
5 changes: 5 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -76,10 +76,12 @@ trim_trailing_whitespace = unset

[pkgs/build-support/dotnetenv/Wrapper/**]
end_of_line = unset
indent_style = unset
insert_final_newline = unset
trim_trailing_whitespace = unset

[pkgs/build-support/upstream-updater/**]
indent_style = unset
trim_trailing_whitespace = unset

[pkgs/development/compilers/elm/registry.dat]
@@ -96,6 +98,9 @@ trim_trailing_whitespace = unset
[pkgs/development/node-packages/composition.nix]
insert_final_newline = unset

[pkgs/development/{perl-modules,ocaml-modules,tools/ocaml}/**]
indent_style = unset

[pkgs/servers/dict/wordnet_structures.py]
trim_trailing_whitespace = unset

4 changes: 3 additions & 1 deletion .github/workflows/editorconfig.yml
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ name: "Checking EditorConfig"

on:
pull_request:
branches-ignore:
- 'release-**'

jobs:
tests:
@@ -23,5 +25,5 @@ jobs:
- name: Checking EditorConfig
if: env.GIT_DIFF
run: |
./bin/editorconfig-checker -disable-indentation \
./bin/editorconfig-checker -disable-indent-size \
${{ env.GIT_DIFF }}