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

tree-sitter: 0.15.7 -> 0.16.4 #80163

Merged
merged 1 commit into from Feb 15, 2020
Merged

tree-sitter: 0.15.7 -> 0.16.4 #80163

merged 1 commit into from Feb 15, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Feb 15, 2020

Includes some bugfixes/cleanups to the scripts and packaging, a run of the
updater, a bump of the version, an upgrade to the newer cargo fetcher in #79975,
and gets the web assembly portion to compile successfully.

Fixes #75863

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.

Includes some bugfixes/cleanups to the scripts and packaging, a run of the
updater, a bump of the version, an upgrade to the newer cargo fetcher in NixOS#79975,
and gets the web assembly portion to compile successfully.

Fixes NixOS#75863
@bhipple
Copy link
Contributor Author

bhipple commented Feb 15, 2020

@GrahamcOfBorg build tree-sitter

@@ -22,7 +22,7 @@ let
res=$(${curl}/bin/curl \
--silent \
"https://api.github.com/repos/${urlEscape owner}/$(${urlEscapeSh} "$repo")/releases/latest")
if [[ "$(printf "%s" "$res" | ${jq}bin/jq '.message')" =~ "rate limit" ]]; then
if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message')" =~ "rate limit" ]]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This never worked previously, but its failure just prints a warning :)

preBuild = ''
HOME=/tmp
bash ./script/build-wasm --debug
'';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We now support web assembly and can remove our old patch (which didn't apply cleanly) and vendoring hacks. Someone who wants to go really above and beyond could also get the JS minify step working, but I'm satisfied taking it to this point.

Copy link
Member

Choose a reason for hiding this comment

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

Let’s add an option to make the web-ui optional.

@Ma27 Ma27 merged commit 59563b6 into NixOS:master Feb 15, 2020
@Profpatsch
Copy link
Member

Thanks! Do you want to add yourself as a maintainer?

@Ma27
Copy link
Member

Ma27 commented Mar 7, 2020

Backported the update slightly altered as 57fafc0 to fix the build on release-20.03 as well.

@Ma27 Ma27 added the 8.has: port to stable A PR already has a backport to the stable release. label Mar 7, 2020
@bhipple bhipple deleted the u/tree-sitter branch June 2, 2020 22:15
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.

tree-sitter out of date
3 participants