diff --git a/overlay.nix b/overlay.nix index 4d33dea..71c70bd 100644 --- a/overlay.nix +++ b/overlay.nix @@ -100,19 +100,24 @@ let overlay-packages = final: prev: { kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; }; - kak-lsp = - let - src = inputs.kak-lsp; - cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; }; - in - final.libs.crane.buildPackage { - inherit src cargoArtifacts; - buildInputs = (with final; - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ]) - ) ++ (with final; [ libiconv ]); + kak-lsp = final.rustPlatform.buildRustPackage { + name = "kak-lsp"; + src = inputs.kak-lsp; + cargoHash = "sha256-U9KxTHzIDtdJ3A62rcdvWlxJfnhbFnS6KDRaV0HJOHE="; + buildInputs = [ final.libiconv ]; - meta.mainProgram = "kak-lsp"; - }; + meta.mainProgram = "kak-lsp"; + }; + # cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; }; + # in + # final.libs.crane.buildPackage { + # inherit src cargoArtifacts; + # buildInputs = (with final; + # lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ]) + # ) ++ (with final; [ libiconv ]); + + # meta.mainProgram = "kak-lsp"; + # }; zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override { inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped; diff --git a/packages/common/kak-tree-sitter/default.nix b/packages/common/kak-tree-sitter/default.nix index 3894888..ff395ff 100644 --- a/packages/common/kak-tree-sitter/default.nix +++ b/packages/common/kak-tree-sitter/default.nix @@ -3,15 +3,15 @@ let src = fetchFromSourcehut { owner = "~hadronized"; repo = "kak-tree-sitter"; - rev = "kak-tree-sitter-v1.1.2"; - hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; + rev = "kak-tree-sitter-v1.1.3"; + hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU="; }; kak-tree-sitter = rustPlatform.buildRustPackage { inherit src; pname = "kak-tree-sitter"; - version = "1.1.2"; - cargoHash = "sha256-ruHklps7NZzsI1ub1trRKyufrP9tufWWrQ+urvEsIdA="; + version = "1.1.3"; + cargoHash = "sha256-1OwPfl1446SYt1556jwR9mvWOWEv+ab+wH7GZQeS4/E="; cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ]; nativeBuildInputs = [ clang git ];