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/fontconfig: harmonize with penultimate #67071

Merged
merged 5 commits into from Aug 21, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Aug 20, 2019

Makes the differences easier to spot when diffing

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 20, 2019

$ git checkout channels/nixos-unstable
$ git diff --shortstat --no-index nixos/modules/config/fonts/fontconfig{,-penultimate}.nix
 1 file changed, 231 insertions(+), 408 deletions(-)
$ git diff --shortstat --ignore-all-space --no-index nixos/modules/config/fonts/fontconfig{,-penultimate}.nix
 1 file changed, 122 insertions(+), 299 deletions(-)

$ git checkout fontconfig-harmonization
$ git diff --shortstat --no-index nixos/modules/config/fonts/fontconfig{,-penultimate}.nix
 1 file changed, 85 insertions(+), 252 deletions(-)
$ git diff --shortstat --ignore-all-space --no-index nixos/modules/config/fonts/fontconfig{,-penultimate}.nix
 1 file changed, 82 insertions(+), 249 deletions(-)

It can be harmonized even more but I am tired of it now.

cc @worldofpeace

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 21, 2019

I tried running a system with fontconfig-penultimate and without it and this did not seem to have broken anything.

@jtojnar jtojnar merged commit d736138 into NixOS:master Aug 21, 2019
@jtojnar jtojnar deleted the fontconfig-harmonization branch August 21, 2019 15:44
@worldofpeace
Copy link
Contributor

Why is penultimate default, is it defunct?

@jtojnar
Copy link
Contributor Author

jtojnar commented Aug 21, 2019

No idea.

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

2 participants