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.
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
nixos/grub: fix whitespace in install-grub #113887
Merged
SuperSandro2000
merged 2 commits into
NixOS:master
from
xaverdh:install-grub-editorconfig-fixup
Nov 29, 2021
Merged
nixos/grub: fix whitespace in install-grub #113887
SuperSandro2000
merged 2 commits into
NixOS:master
from
xaverdh:install-grub-editorconfig-fixup
Nov 29, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
Diff against the commit before formatting changes where introduced: https://termbin.com/g3woz The hunk at |
I marked this as stale due to inactivity. → More info |
stale
bot
added
the
2.status: stale
https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md
label
Aug 21, 2021
@SuperSandro2000 can you take care of this? |
stale
bot
removed
the
2.status: stale
https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md
label
Nov 25, 2021
@xaverdh please rebase |
xaverdh
force-pushed
the
install-grub-editorconfig-fixup
branch
from
November 27, 2021 09:14
6e2f594
to
afbdc3f
Compare
This morally reverts commit 0e8d7f9. It made the generated boot script hard to read.
This time hopefully without changing the generated boot script.
xaverdh
force-pushed
the
install-grub-editorconfig-fixup
branch
from
November 27, 2021 09:18
afbdc3f
to
0360e03
Compare
rebased |
SuperSandro2000
changed the title
Fix whitespace in install-grub
nixos/grub: fix whitespace in install-grub
Nov 29, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
#113570 accidentally changed the layout of the generated boot script, fix this.
This is a revert of the relevant commit followed by redoing the changes, except for the places related to the boot script (so its easier to review by just looking at the new commit).
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)