diff options
| author | Simon Žlender <pub.git@zlender.si> | 2023-10-09 19:17:06 +0200 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-10-11 13:56:41 -0300 |
| commit | 5dcafc36852cd8d96127f5cbfe42918bf262214e (patch) | |
| tree | b9f290e95bfe82eca63a0fd623d47aff960a389f | |
| parent | b17a59b240acb0c770aa19e0aea8119c1df63e89 (diff) | |
{nickel,nls}: make nls an output of nickel
| -rw-r--r-- | pkgs/development/interpreters/nickel/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/language-servers/nls/default.nix | 24 |
2 files changed, 13 insertions, 21 deletions
diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index 4d4be8601e6dc..199f75ea635b6 100644 --- a/pkgs/development/interpreters/nickel/default.nix +++ b/pkgs/development/interpreters/nickel/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , python3 , nix-update-script -, stdenv }: rustPlatform.buildRustPackage rec { @@ -29,12 +28,19 @@ rustPlatform.buildRustPackage rec { }; }; - cargoBuildFlags = [ "-p nickel-lang-cli" ]; + cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; nativeBuildInputs = [ python3 ]; + outputs = [ "out" "nls" ]; + + postInstall = '' + mkdir -p $nls/bin + mv $out/bin/nls $nls/bin/nls + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/tools/language-servers/nls/default.nix b/pkgs/development/tools/language-servers/nls/default.nix index 5bafc0c1782c3..d060207f7af3f 100644 --- a/pkgs/development/tools/language-servers/nls/default.nix +++ b/pkgs/development/tools/language-servers/nls/default.nix @@ -1,27 +1,13 @@ -{ lib -, rustPlatform +{ symlinkJoin , nickel -, stdenv }: -rustPlatform.buildRustPackage { +symlinkJoin { + name = "nls-${nickel.version}"; pname = "nls"; + inherit (nickel) version; - inherit (nickel) src version nativeBuildInputs; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM="; - "tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; - "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; - "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; - "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; - "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; - }; - }; - - cargoBuildFlags = [ "-p nickel-lang-lsp" ]; + paths = [ nickel.nls ]; meta = { inherit (nickel.meta) homepage changelog license maintainers; |