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.20.7 -> 0.20.8 #225148

Merged
merged 1 commit into from
Apr 8, 2023
Merged

tree-sitter: 0.20.7 -> 0.20.8 #225148

merged 1 commit into from
Apr 8, 2023

Conversation

teto
Copy link
Member

@teto teto commented Apr 7, 2023

0.20.8 will be required by neovim 0.9 so this is a preliminary bump

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@teto
Copy link
Member Author

teto commented Apr 7, 2023

seems to pass nixpkgs-review

@teto teto mentioned this pull request Apr 7, 2023
12 tasks
@teto
Copy link
Member Author

teto commented Apr 7, 2023

@DieracDelta could you push the fix you proposed #225152 (comment) here ?

@DieracDelta
Copy link
Member

err do I have push perms? The fix is the change here

@teto
Copy link
Member Author

teto commented Apr 7, 2023

I think so, I've allowed edit by maintainers and you are part of the nixpkgs org . I would rather have you push because you can test, if it doesn't work, I can do it.

@DieracDelta
Copy link
Member

DieracDelta commented Apr 7, 2023

I don't have push perms (unclear why), but here's the diff that builds correctly on my machine:

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 3cb407fa0ab..9da09a10e7e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -16,7 +16,7 @@
 , Security
 , callPackage
 , linkFarm
-
+, CoreServices
 , enableShared ? !stdenv.hostPlatform.isStatic
 , enableStatic ? stdenv.hostPlatform.isStatic
 , webUISupport ? false
@@ -111,7 +111,7 @@ rustPlatform.buildRustPackage {
   inherit src version cargoSha256;

   buildInputs =
-    lib.optionals stdenv.isDarwin [ Security ];
+    lib.optionals stdenv.isDarwin [ Security CoreServices];
   nativeBuildInputs =
     [ which ]
     ++ lib.optionals webUISupport [ emscripten ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 781d5efafc7..28320db77cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19013,7 +19013,7 @@ with pkgs;
   travis = callPackage ../development/tools/misc/travis { };

   tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk.frameworks) Security CoreServices;
   };

   tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;

0.20.8 will be required by neovim 0.9 so this is a preliminary bump
@teto
Copy link
Member Author

teto commented Apr 7, 2023

@Profpatsch looks good to go ?

@luxus
Copy link
Contributor

luxus commented Apr 8, 2023

lgtm

@teto
Copy link
Member Author

teto commented Apr 8, 2023

nxipkgs-review looks broken for me, it builds 1300 packages (mostly vim plugins) than shows up with an internal error. Plugins build fine, neovim and emacs too so merging this since it's a neovim 0.9 blocker.

@teto teto merged commit aeb3a38 into NixOS:master Apr 8, 2023
@teto teto deleted the bump-treesitter branch April 8, 2023 17:20
@kirillrdy kirillrdy mentioned this pull request Jan 26, 2024
13 tasks
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.

3 participants