Skip to content

gtk: fix missing newline in formatted config#2809

Merged
berbiche merged 1 commit intonix-community:masterfrom
polykernel:fix-config-concatenation
Mar 20, 2022
Merged

gtk: fix missing newline in formatted config#2809
berbiche merged 1 commit intonix-community:masterfrom
polykernel:fix-config-concatenation

Conversation

@polykernel
Copy link
Copy Markdown
Contributor

@polykernel polykernel commented Mar 20, 2022

The conversion from concatMapStrings to concatStringsSep introduced in #2481
creates an unintended behavior change where the formatted config does not end in a newline.[1]
This is problematic for manipulation at the Nix level. In particular, this cause a regression in
the generation of gtk2 settings due to concatenated of the formatted config and gtk2.extraConfig
without a newline in between.

This commit restores concatMapStrings to match the previous behavior and adds a newline to
the final string for the generated gtk2 config. The test case for gtk2-basic-config
was also updated to check behavior at concatenation boundaries.

[1] - #2481 (comment)

Description

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

    • Added myself and the module files to .github/CODEOWNERS.

The conversion from `concatMapStrings` to `concatStringsSep` introduced in #2481
creates an unintended behavior change where the formatted config does not end in a newline.[1]
This is problematic for manipulation at the Nix level. In particular, this cause a regression in
the generation of gtk2 settings due to concatenated of the formatted config and `gtk2.extraConfig`
without a newline in between.

This commit restores `concatMapStrings` to match the previous behavior and adds a newline to
the final string for the generated gtk2 config. The test case for gtk2-basic-config
was also updated to check behavior at concatenation boundaries.

[1] - #2481 (comment)
@polykernel polykernel requested a review from rycee as a code owner March 20, 2022 19:50
@berbiche berbiche merged commit 46dc2e5 into nix-community:master Mar 20, 2022
@polykernel polykernel deleted the fix-config-concatenation branch March 20, 2022 20:30
jficz pushed a commit to jficz/home-manager that referenced this pull request Apr 7, 2022
The conversion from `concatMapStrings` to `concatStringsSep` introduced in nix-community#2481
creates an unintended behavior change where the formatted config does not end in a newline.[1]
This is problematic for manipulation at the Nix level. In particular, this cause a regression in
the generation of gtk2 settings due to concatenated of the formatted config and `gtk2.extraConfig`
without a newline in between.

This commit restores `concatMapStrings` to match the previous behavior and adds a newline to
the final string for the generated gtk2 config. The test case for gtk2-basic-config
was also updated to check behavior at concatenation boundaries.

[1] - nix-community#2481 (comment)
@teto teto mentioned this pull request Aug 22, 2022
7 tasks
teto pushed a commit to teto/home-manager that referenced this pull request Aug 22, 2022
The conversion from `concatMapStrings` to `concatStringsSep` introduced in nix-community#2481
creates an unintended behavior change where the formatted config does not end in a newline.[1]
This is problematic for manipulation at the Nix level. In particular, this cause a regression in
the generation of gtk2 settings due to concatenated of the formatted config and `gtk2.extraConfig`
without a newline in between.

This commit restores `concatMapStrings` to match the previous behavior and adds a newline to
the final string for the generated gtk2 config. The test case for gtk2-basic-config
was also updated to check behavior at concatenation boundaries.

[1] - nix-community#2481 (comment)
spacekookie pushed a commit to spacekookie/home-manager that referenced this pull request Feb 10, 2023
The conversion from `concatMapStrings` to `concatStringsSep` introduced in nix-community#2481
creates an unintended behavior change where the formatted config does not end in a newline.[1]
This is problematic for manipulation at the Nix level. In particular, this cause a regression in
the generation of gtk2 settings due to concatenated of the formatted config and `gtk2.extraConfig`
without a newline in between.

This commit restores `concatMapStrings` to match the previous behavior and adds a newline to
the final string for the generated gtk2 config. The test case for gtk2-basic-config
was also updated to check behavior at concatenation boundaries.

[1] - nix-community#2481 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants