Skip to content

Comments

Fix indentation#145841

Merged
roberth merged 3 commits intoNixOS:stagingfrom
l0b0:fix-indentation
Nov 17, 2021
Merged

Fix indentation#145841
roberth merged 3 commits intoNixOS:stagingfrom
l0b0:fix-indentation

Conversation

@l0b0
Copy link
Contributor

@l0b0 l0b0 commented Nov 14, 2021

Motivation for this change

Enforced by editorconfig-checker, resulting in false positives).

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) label Nov 14, 2021
l0b0 added 2 commits November 14, 2021 16:04
Some literal tabs within strings should probably be spaces `\t`, but
I'm not familiar enough to make that call.
I've tried to be consistent, using four or eight spaces to line up
with existing code.
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 14, 2021
@l0b0 l0b0 mentioned this pull request Nov 14, 2021
12 tasks
@roberth
Copy link
Member

roberth commented Nov 17, 2021

ci fails. vanity.sh is not completely fixed.

More risky since it affects the inside of strings.
@l0b0
Copy link
Contributor Author

l0b0 commented Nov 17, 2021

ci fails. vanity.sh is not completely fixed.

I originally left it like that because the "indentation" is inside strings. I've added a separate commit changing that, but it's more risky. We shouldn't really use literal tabs inside Bash scripts in any case; it's really easy to mess up without noticing.

@roberth
Copy link
Member

roberth commented Nov 17, 2021

SPARQL doesn't seem to be indentation sensitive and it was already using mixed indentation, so this seems to be an improvement. It also isn't a critical script, so both probability and impact are low => lgtm.

@roberth
Copy link
Member

roberth commented Nov 17, 2021

OfBorg is ok. Staging will not make it into the release, so no need for extra concern.

@roberth roberth merged commit 9005cb8 into NixOS:staging Nov 17, 2021
@l0b0 l0b0 deleted the fix-indentation branch November 17, 2021 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants