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

[ZHF] polyml: fix with new libffi #81030

Merged
merged 2 commits into from Mar 2, 2020
Merged

Conversation

KoviRobi
Copy link
Contributor

@KoviRobi KoviRobi commented Feb 25, 2020

New libffi doesn't have FFI_SYSV for x86/64 unix, this pulls in the
commit for the upstream version which fixes it, and ports that patch to
the 5.7 version. The 5.6 version is unchanged.

For ZHF: #80379

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

New libffi doesn't have FFI_SYSV for x86/64 unix, this pulls in the
commit for the upstream version which fixes it, and ports that patch to
the 5.7 version. The 5.6 version is unchanged.

For ZHF: NixOS#80379
@KoviRobi
Copy link
Contributor Author

One thing I am not sure about, is how long we should support the older versions for; does anything depend on them? The nixpkgs-review didn't do anything, not sure if I used it correctly

@KoviRobi KoviRobi changed the title polyml: fix with new libffi [ZHF] polyml: fix with new libffi Feb 25, 2020
@yurrriq
Copy link
Member

yurrriq commented Feb 26, 2020

Thanks for this! I should probably be removed as maintainer.. I've not done much with ML for some time..

I am not sure if we still need the old packages, nothing explicitly
depends on polyml56 or polyml57 according to a grep, not sure if
external packages might (hol and isabelle depend on polyml, the latest
version).
@FRidh FRidh merged commit f4c29eb into NixOS:master Mar 2, 2020
@FRidh
Copy link
Member

FRidh commented Mar 2, 2020

cherry-picked as 0edebab

@KoviRobi KoviRobi deleted the zhf-20.03-fix-polyml branch October 10, 2022 09:51
@KoviRobi KoviRobi restored the zhf-20.03-fix-polyml branch October 10, 2022 09:51
@KoviRobi KoviRobi deleted the zhf-20.03-fix-polyml branch October 10, 2022 09:54
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

3 participants