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

spidermonkey_78: 78.4.0 -> 78.8.0 #114030

Merged
merged 1 commit into from Feb 27, 2021
Merged

spidermonkey_78: 78.4.0 -> 78.8.0 #114030

merged 1 commit into from Feb 27, 2021

Conversation

nagy
Copy link
Member

@nagy nagy commented Feb 22, 2021

Motivation for this change

This update is needed for an upcoming PR for zeroad. The attached patch will be needed for that. It also allows for other "external embedders" of spidermonkey as described in the linked bugreport.

Should this rather go to staging?

Notify Maintainers

Cc: @abbradar @lostnet

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.

Copy link
Contributor

@lostnet lostnet left a comment

Choose a reason for hiding this comment

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

The patch for 1644600 seems fine to me. I think this could go to the latest release though: 78.7.1?

I think staging is right based on the path for spidermonkey/llvm_11 pinging @SuperSandro2000

@SuperSandro2000
Copy link
Member

/rebase staging

@github-actions github-actions bot changed the base branch from master to staging February 23, 2021 01:19
@github-actions
Copy link
Contributor

Rebased, please reopen the pull request to restart CI

@github-actions github-actions bot closed this Feb 23, 2021
@ofborg ofborg bot requested a review from lostnet February 23, 2021 01:45
# https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
# Once that bug is fixed, this can be removed.
# This is needed in, for example, `zeroad`.
sed -i "s/class SharedArrayRawBufferRefs {/class JS_PUBLIC_API SharedArrayRawBufferRefs {/g" \
Copy link
Member

Choose a reason for hiding this comment

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

Can we use here substituteInPlace to make this simpler?

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

@lblasc
Copy link
Contributor

lblasc commented Feb 24, 2021

This will be needed to fix build after rustc PR #112792 gets merged, I suggest version bump directly to 78.7.0 before merging.

@SuperSandro2000
Copy link
Member

This will be needed to fix build after rustc PR #112792 gets merged, I suggest version bump directly to 78.7.0 before merging.

We can also bump it in another PR to get this merged faster. The complex sed is a bigger concern for me.

@nagy
Copy link
Member Author

nagy commented Feb 24, 2021

Sorry for the noise, I did not mean to ping all these reviewers. I force pushed my local branch while it was still based on master and then it included all the staging commits. Then it auto-requested reviews.

I have replaced the sed call with substituteInPlace. It looks like the newest version is 78.8.0 . If you want I can bump it to it. I just chose this specifc minor version because it is what zeroad requests, but i guess having a more recent version here is more important.

https://ftp.mozilla.org/pub/firefox/releases/78.8.0esr/

@nagy nagy changed the title spidermonkey_78: 78.4.0 -> 78.6.0 spidermonkey_78: 78.4.0 -> 78.8.0 Feb 26, 2021
@nagy
Copy link
Member Author

nagy commented Feb 26, 2021

I have bumped the version to 78.8.0

--replace "class SharedArrayRawBufferRefs {" \
"class JS_PUBLIC_API SharedArrayRawBufferRefs {"
'';

meta = with lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = "https://developer.mozilla.org/en/SpiderMonkey";
Copy link
Member

Choose a reason for hiding this comment

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

The homepage seems to be broken as well

Copy link
Member Author

Choose a reason for hiding this comment

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

I may change it to https://spidermonkey.dev/

Copy link
Member Author

Choose a reason for hiding this comment

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

updated

Copy link
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

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

Changes look fine. Builds and runs (checked usage).

@mweinelt mweinelt merged commit 5356064 into NixOS:staging Feb 27, 2021
@nagy nagy deleted the spidermonkey branch February 27, 2021 13:10
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

6 participants