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

commented Aug 20, 2019

Makes the differences easier to spot when diffing

jtojnar added 5 commits Aug 20, 2019
to be more in line with fontconfig.nix
@jtojnar

This comment has been minimized.

Copy link
Contributor Author

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

This comment has been minimized.

Copy link
Contributor Author

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
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@jtojnar jtojnar deleted the jtojnar:fontconfig-harmonization branch Aug 21, 2019
@worldofpeace

This comment has been minimized.

Copy link
Member

commented Aug 21, 2019

Why is penultimate default, is it defunct?

@jtojnar

This comment has been minimized.

Copy link
Contributor Author

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
2 participants
You can’t perform that action at this time.