{nickel,nls}: make nls an output of nickel

This commit is contained in:
Simon Žlender
2023-10-11 13:56:41 -03:00
committed by Anderson Torres
parent b17a59b240
commit 5dcafc3685
2 changed files with 13 additions and 21 deletions
@@ -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; {
@@ -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;