Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treewide: remove trailing whitespace #108118

Merged
merged 2 commits into from
Jan 1, 2021
Merged

treewide: remove trailing whitespace #108118

merged 2 commits into from
Jan 1, 2021
+108 −113

Conversation

siraben
Copy link
Member

@siraben siraben commented Jan 1, 2021 •
edited
Loading

Motivation for this change

We already do this check in ofborg, might as well apply it to all Nix files.

$  find . -name "*.nix" -type f -print0 | xargs -0 sed -i '' -E "s/[[:space:]]*$//"
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@siraben siraben force-pushed the whitespace-cleanup branch from 5ff3332 to 42d741b Compare January 1, 2021 12:27
@siraben siraben changed the base branch from master to staging January 1, 2021 12:27
@siraben siraben changed the title treemode: remove trailing whitespace treewide: remove trailing whitespace Jan 1, 2021
@ofborg ofborg bot added 6.topic: emacs Text editor 6.topic: erlang 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: stdenv Standard environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 1, 2021
@siraben siraben force-pushed the whitespace-cleanup branch 3 times, most recently from 9196cd0 to b25e269 Compare January 1, 2021 13:19
@zowoq
Copy link
Contributor

zowoq commented Jan 1, 2021 •
edited
Loading

Yep, I'm going through that file now and reverting them to HEAD~2.

Might be easier to use editorconfig-checker to generate the list of files that need changes as it respects the excludes file?

@siraben
Copy link
Member Author

siraben commented Jan 1, 2021

Ah, didn't know about that. Thanks.

@siraben siraben force-pushed the whitespace-cleanup branch from b25e269 to 210e3c9 Compare January 1, 2021 13:23
@ofborg ofborg bot removed the 6.topic: ruby label Jan 1, 2021
@siraben siraben force-pushed the whitespace-cleanup branch from 210e3c9 to ad0af02 Compare January 1, 2021 13:47
@siraben
Copy link
Member Author

siraben commented Jan 1, 2021 

$ nix-shell -p editorconfig-checker --run 'editorconfig-checker -disable-indent-size -disable-indent-size -disable-insert-final-newline -disable-indentation' | decolorize | grep -v '^[[:blank:]]' | cut -d':' -f1 | xargs sed -i '' -E "s/[[:space:]]*$//"

@ofborg ofborg bot removed 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: python 6.topic: xfce The Xfce Desktop Environment 8.has: documentation This PR adds or changes documentation labels Jan 1, 2021
@ofborg ofborg bot requested review from spacekookie, oxzi, Pacman99, bfortz and obadz and removed request for infinisil and bfortz January 1, 2021 13:56
jonringer
jonringer approved these changes Jan 1, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

failures are broken on target branch

2 packages failed to build:
apitrace minergate-cli

7 packages built:
deadd-notification-center firehol fusee-interfacee-tk keepass ly nanoblogger wavrsocvt

@jonringer jonringer merged commit 3496ce2 into NixOS:staging Jan 1, 2021
@siraben siraben deleted the whitespace-cleanup branch January 2, 2021 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aadibajpai aadibajpai

@jonringer jonringer

@adisbladis adisbladis

@alyssais alyssais

@cdepillabout cdepillabout

@Ericson2314 Ericson2314

@FRidh FRidh

@matthewbauer matthewbauer

@mmahut mmahut

@RaghavSood RaghavSood

@stigtsp stigtsp

@ttuegel ttuegel

@spacekookie spacekookie

@oxzi oxzi

@Pacman99 Pacman99

@obadz obadz

Assignees
No one assigned
Labels
6.topic: emacs Text editor 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@siraben @zowoq @jonringer @aadibajpai