treewide: Fix indentation in strings#350296
Merged
piegamesde merged 1 commit intoNixOS:masterfrom Oct 23, 2024
Merged
Conversation
23dd0a3 to
9e02207
Compare
Member
SuperSandro2000
left a comment
There was a problem hiding this comment.
Maybe we should split out all the meta changes to make this easier to merge faster?
4039087 to
19b40bb
Compare
Member
Author
|
I took out some big packages, but this still has 36000 rebuilds. I've taken out some obvious candidates but I'm a bit at a loss now, so I'd appreciate any hints as to what may be causing these rebuilds. |
19b40bb to
43cca80
Compare
43193e6 to
987bf9b
Compare
Member
Author
|
Result of 9 packages failed to build:
47 packages built:
AFAICT, ponyc is already broken on master (CC @kamilchm @patternspandemic @redvers). The emscriptenPackages failures look like an unrelated dependency failure to me (CC @jtojnar @qknight). The datadog-agent failure is mine and will be fixed with the next push (I fell for the exact same syntax gotcha again which I was trying to fix …) |
987bf9b to
9b80772
Compare
jtojnar
approved these changes
Oct 22, 2024
Member
jtojnar
left a comment
There was a problem hiding this comment.
Skimmed through the build changes, looks good, only minor style comments.
pkgs/games/mindustry/default.nix
Outdated
Comment on lines
192
to
193
Member
There was a problem hiding this comment.
This will not have correct indentation either. Maybe something like:
Suggested change
| --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ ${lib.optionalString enableWayland '' | |
| --set SDL_VIDEODRIVER wayland \ | |
| --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/${lib.optionalString enableWayland '' | |
| \ | |
| --set SDL_VIDEODRIVER wayland \ |
Though it probably does not matter.
The indentation stripping semantics of strings are fairly bad and have a few gotchas where the resulting string has not the intended indentation. This commit fixes most if not all such instances in Nixpkgs. I tried to strive a balance between keeping the diff small and reformatting/refactoring the code to look better. In general, reformatting should be left to Nixfmt. Note that this causes a lot of rebuilds by design. All changes need to be thoroughly vetted and reviewed for correctness. There is no automatic way to prove correctness. List of files to fix generated by running https://gerrit.lix.systems/c/lix/+/2092 on Nixpkgs and looking at the warnings.
9b80772 to
6892791
Compare
Member
Author
|
@ofborg eval |
13 tasks
piegamesde
added a commit
that referenced
this pull request
Oct 24, 2024
Follow-up on #350296 with the packages that cause big rebuilds and need to go through staging.
13 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The indentation stripping semantics of strings are fairly bad and have a few gotchas where the resulting string has not the intended indentation. This commit fixes most if not all such instances in Nixpkgs.
I tried to strive a balance between keeping the diff small and reformatting/refactoring the code to look better. In general, reformatting should be left to Nixfmt.
Note that this causes a lot of rebuilds by design. All changes need to be thoroughly vetted and reviewed for correctness. There is no automatic way to prove correctness.
List of files to fix generated by running
https://gerrit.lix.systems/c/lix/+/2092 on Nixpkgs and looking at the warnings.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)