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

Jump to bottom

fish: use internal wcwidth #64843

Merged
merged 1 commit into from Jul 18, 2019
Merged

fish: use internal wcwidth #64843

merged 1 commit into from Jul 18, 2019

Conversation

nyarly
Copy link
Contributor

@nyarly nyarly commented Jul 15, 2019 •
edited

Motivation for this change

Fish 3.0 has an updated an more robust handling of unicode glyphs. Per the original author of the INTERNAL_WCWIDTH flag, it was something of misfeature, and they regret that NixOS came to rely on it.

I'm running this fish locally, and it works well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.

@ofborg ofborg bot requested a review from ocharles July 15, 2019 22:19
worldofpeace
worldofpeace suggested changes Jul 18, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @nyarly.

Can you please format your commit like fish: use internal wcwidth?
Also reference when it was added in the body 68076b7 and that it was removed upstream fish-shell/fish-shell#5777.

@nyarly
fish: use internal wcwidth
2c9c395 
Fish 3.0 has an updated an more robust handling of unicode glyphs. Per
the original author of the INTERNAL_WCWIDTH flag, it was something of
misfeature, and they regret that NixOS came to rely on it.

Removes the flag from the Nix expression.

Flag was added originally to Nixpkgs in 68076b7

It is being removed entirely from upstream fish:
fish-shell/fish-shell#5777.
@nyarly
Copy link
Contributor Author

nyarly commented Jul 18, 2019

@worldofpeace, thanks for your comments - I've amended my comment as suggested.

@worldofpeace worldofpeace changed the title (fish): remove cmake flag fish: use internal wcwidth Jul 18, 2019
@worldofpeace
Copy link
Contributor

Thanks @nyarly.

I see no reason to go against upstream so I'm going to merge this without further feedback.

@worldofpeace worldofpeace merged commit b2e0ab3 into NixOS:master Jul 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace requested changes

@ocharles ocharles Awaiting requested review from ocharles

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nyarly @worldofpeace