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

zsh: apply upstream fix from 5.6.1 #46452

Closed
wants to merge 2 commits into from

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Sep 9, 2018

5.6.1 is tagged on GitHub but not available
on sf.net for whatever reason.

Attempting to build from github doesn't work
without some changes to the expression so instead
grab this fix introduced in update to 5.6.

Add missing include of math.h while visiting this,
needed for new (5.6) use of isnan/isinf .

  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@dtzWill dtzWill requested a review from hrdinka September 9, 2018 23:02
@dtzWill
Copy link
Member Author

dtzWill commented Sep 9, 2018

(review request suggested by GitHub <3)

@Mic92
Copy link
Member

Mic92 commented Sep 10, 2018

I reported the math.h patch upstream: zsh-users/zsh#28

@danielshahaf
Copy link

danielshahaf commented Sep 10, 2018

5.6.1 is tagged on GitHub but not available
on sf.net for whatever reason.

Actually, it is available on sf.net on the zsh-dev directory. This is because 5.6.1 is currently in testing on the upstream development mailing list; if no blockers are found, it will be uploaded to the usual directory and announced to zsh-announce@.

In principle, I wouldn't expect downstreams to package versions that haven't been announced outside the development list. At least, that's what I'm used to; see https://github.com/apache/subversion/blob/bed1c4dbbd6ce7fe9bbddd5245c50202832478da/tools/dist/templates/rc-release-ann.ezt#L40-L51

@hrdinka
Copy link
Contributor

hrdinka commented Sep 10, 2018

@dtzWill thanks for your contribution!

I am currently testing these changes locally and everything seems to be working. We should merge this fix until zsh 5.6.1 is released. While I am fine with merging I will wait another day to give the actual maintainers of this derivation some time to look into it: @chaoflow @pSub

@Mic92, @danielshahaf thanks for the upstream report & follow up! Looking forward to 5.6.1

@danielshahaf
Copy link

5.6.1 has been released.

@hrdinka hrdinka mentioned this pull request Sep 10, 2018
9 tasks
@hrdinka
Copy link
Contributor

hrdinka commented Sep 10, 2018

@danielshahaf, oh I see, thanks!

I have created a new pull request with the update over here: #46499.

@hrdinka hrdinka closed this Sep 10, 2018
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

5 participants