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.

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
merged 2 commits into from Nov 29, 2021

Conversation

xaverdh
Copy link
Contributor

@xaverdh xaverdh commented Feb 21, 2021

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
  • 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.

@SuperSandro2000
Copy link
Member

Diff against the commit before formatting changes where introduced: https://termbin.com/g3woz

The hunk at @@ -356,11 +356,11 @@ was my indented change.

@stale
Copy link

stale bot commented Aug 21, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 21, 2021
@flokli
Copy link
Contributor

flokli commented Nov 25, 2021

@SuperSandro2000 can you take care of this?

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Nov 25, 2021
@SuperSandro2000
Copy link
Member

@xaverdh please rebase

@xaverdh xaverdh force-pushed the install-grub-editorconfig-fixup branch from 6e2f594 to afbdc3f Compare November 27, 2021 09:14
@xaverdh xaverdh requested a review from dasJ as a code owner November 27, 2021 09:14
This morally reverts commit 0e8d7f9.
It made the generated boot script hard to read.
This time hopefully without changing the generated boot script.
@xaverdh
Copy link
Contributor Author

xaverdh commented Nov 28, 2021

rebased

@SuperSandro2000 SuperSandro2000 changed the title Fix whitespace in install-grub nixos/grub: fix whitespace in install-grub Nov 29, 2021
@SuperSandro2000
Copy link
Member

@ofborg build grub
@ofborg test grub

@SuperSandro2000 SuperSandro2000 merged commit 61c3243 into NixOS:master Nov 29, 2021
@xaverdh xaverdh deleted the install-grub-editorconfig-fixup branch December 1, 2021 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants