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

ocamlPackages.zarith: use buildOcaml instead of mkDerivation #53984

Merged

Conversation

thoughtpolice
Copy link
Member

This has two main advantages:

  • By setting hasSharedObjects = true, buildOcaml will automatically
    include a setup-hook.sh that sets CAML_LD_LIBRARY_PATH in dependent
    expressions. This is needed to pick up dllzarith.so properly which is
    shipped as party of the library.

  • We can kill the ugly assert in the expression and instead change it
    to use minimumSupportedOcamlVersion.

(Note: this was reverted in b44d513, but the change is
exactly equivalent -- I wasn't sure what impact zarith might actually
have without checking OfBorg, which I wanted to do first.)

Signed-off-by: Austin Seipp aseipp@pobox.com

Motivation for this change
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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This has two main advantages:

  - By setting hasSharedObjects = true, buildOcaml will automatically
include a setup-hook.sh that sets CAML_LD_LIBRARY_PATH in dependent
expressions. This is needed to pick up dllzarith.so properly which is
shipped as part of the library.

  - We can kill the ugly assert in the expression and instead change it
to use minimumSupportedOcamlVersion.

(Note: this was reverted in b44d513, but the change is
exactly equivalent -- I wasn't sure what impact zarith might actually
have without checking OfBorg, which I wanted to do first.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
@thoughtpolice thoughtpolice force-pushed the nixpkgs/ocaml-packages-zarith-update branch from f61cca4 to be26098 Compare January 15, 2019 07:10
@thoughtpolice thoughtpolice merged commit 564653f into NixOS:master Jan 15, 2019
@thoughtpolice thoughtpolice deleted the nixpkgs/ocaml-packages-zarith-update branch January 15, 2019 07:28
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