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

smlnj: 110.91 -> 110.95, add 64-bit support #74745

Merged
merged 2 commits into from Dec 4, 2019
Merged

Conversation

aske
Copy link
Member

@aske aske commented Nov 30, 2019

Motivation for this change

Update package, use 64-bit support added in 110.94.
Also drop isDarwin check in top-level/all-packages.nix till darwin build is fixed.

I needed to patch heap2exec for it to run after installation; I filed an upstream bug here.

With these changes on x86_64-linux only 64-bit version is installed , though smlnj also supports simultaneous 32 and 64 bit installation. Would it be useful to add support for joint installation?

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 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.
Notify maintainers

cc @thoughtpolice

@aske
Copy link
Member Author

aske commented Nov 30, 2019

Hm, this seems to break even the latest revision of manticore, I'll investigate further a bit later.

@aske aske force-pushed the smlnj-upd branch 2 times, most recently from bad480f to 2ccdb28 Compare December 1, 2019 17:15
@aske
Copy link
Member Author

aske commented Dec 1, 2019

Fixed manticore with new smlnj, though let's see if these fixes are right (ManticoreProject/manticore#17).

Also drop isDarwin check in `top-level/all-packages.nix` till darwin build is fixed.
@aske
Copy link
Member Author

aske commented Dec 4, 2019

Alright, with all changes accepted by upstream this PR is now ready.

Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines -8726 to -8728
smlnj = if stdenv.isDarwin
then callPackage ../development/compilers/smlnj { }
else pkgsi686Linux.callPackage ../development/compilers/smlnj { };
Copy link
Member

Choose a reason for hiding this comment

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

💯

@thoughtpolice
Copy link
Member

@GrahamcOfBorg build smlnj

@thoughtpolice thoughtpolice merged commit 05358c6 into NixOS:master Dec 4, 2019
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