-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
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.95 -> 110.99.6.1 #329975
smlnj: 110.95 -> 110.99.6.1 #329975
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@thoughtpolice Can this be merged? |
No, there are merge conflicts. |
b13d04a
to
4787af1
Compare
One remaining issue is the use of a timestamp in the build process. If this is an issue, I could try to add a patch that fixes the date of the version release. |
I'm not the maintainer but I think adding a small patch to fix this would be the best. If it must be a time/date it's typically the unix epoch and that is overall pretty straightforwardly clear where it's coming from / since it's in nixpkgs the user can check the path to determine what build it was from nonetheless. |
Although the call to |
I got verbal confirmation that this will be fixed in the next upstream release. I think it doesn't make sense to implement the patch in Nix since it cannot be done via |
591b301
to
df067cd
Compare
110.99.6.1 fixes a bug, but also changes removes the build-time dependency. This should fix the non-reproducibility issue. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks fine, but collapse these commits into one; that's a typical policy for many packages here. There is no reason to have the intermediate updates when they will be immediately superseded anyway due to bugfixes or whatnot.
df067cd
to
797357e
Compare
Should be squashed now. Do I need to document the changelog, or link to the changelog on smlnj.org anywhere? |
797357e
to
cf492bd
Compare
No. If you write an update script so that updates are automatic, then the @r-ryantm can normally do the links and stuff for you. But I wouldn't worry about it for now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved, but needs a rebase after the maintainer update.
cf492bd
to
7c62eae
Compare
Should be fixed now. |
An example of updating multiple hashes is here, in another package I maintain, if you're interested: https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/tools/build-managers/buck2 In short, I'd recommend you just generate Update scripts like this are a little fragile but it's often not too bad if you expect things won't change much e.g. as the maintainer of that package I know buck2 isn't going to change drastically, so it's worked reliably for months even though it just does In any case I'll merge this once I see the CI go green. |
7c62eae
to
2846633
Compare
Description of changes
Standard ML of New Jersey is updated to 110.99.6.1.
Change log can be found on the smlnj.org website.
Outside of updating hashes, this version bump allows the removal of the
heap2exec.diff
file, since the build system issue was fixed. It also requires a slightly different regex to pass tosed
during patching.The compiler binary and libraries have been extensively tested. The other binaries all run but have not yet been as extensively tested.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.