Merge pull request #183871 from figsoda/update-taplo-cli

taplo: rename from taplo-{cli,lsp}, 0.6.2 -> 0.6.9

1 files changed, 16 insertions, 7 deletions

diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo/default.nix
index 0c584a36a526..64437bb32529 100644
--- a/pkgs/development/tools/taplo-cli/default.nix
+++ b/pkgs/development/tools/taplo/default.nix
@@ -1,26 +1,35 @@
-{ lib, rustPlatform, fetchCrate, stdenv, pkg-config, openssl, Security }:
+{ lib
+, rustPlatform
+, fetchCrate
+, openssl
+, stdenv
+, Security
+, withLsp ? true
+}:
 
 rustPlatform.buildRustPackage rec {
-  pname = "taplo-cli";
-  version = "0.6.2";
+  pname = "taplo";
+  version = "0.6.9";
 
   src = fetchCrate {
-    inherit pname version;
-    sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY=";
+    inherit version;
+    pname = "taplo-cli";
+    sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys=";
   };
 
-  cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0=";
+  cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs=";
 
   OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
   OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
+  buildFeatures = lib.optional withLsp "lsp";
+
   meta = with lib; {
     description = "A TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
     license = licenses.mit;
     maintainers = with maintainers; [ figsoda ];
-    mainProgram = "taplo";
   };
 }