From e517b841291e9cb28bf4c0f729a60dc88f75c385 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 30 Jul 2022 10:25:11 +0800
Subject: [PATCH] taplo: rename from taplo-{cli,lsp}, 0.6.2 -> 0.6.9

---
 .../tools/{taplo-cli => taplo}/default.nix    | 23 +++++++++++++------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  6 +----
 3 files changed, 19 insertions(+), 12 deletions(-)
 rename pkgs/development/tools/{taplo-cli => taplo}/default.nix (54%)

diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo/default.nix
similarity index 54%
rename from pkgs/development/tools/taplo-cli/default.nix
rename to 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";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index aa86ec511f6b..1c3bdf690dde 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1365,6 +1365,8 @@ mapAliases ({
 
   tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22
   tangogps = foxtrotgps; # Added 2020-01-26
+  taplo-cli = taplo; # Added 2022-07-30
+  taplo-lsp = taplo; # Added 2022-07-30
   tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead";
   teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05
   telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e13408727be4..0d3140194b53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16775,11 +16775,7 @@ with pkgs;
 
   szyszka = callPackage ../tools/misc/szyszka { };
 
-  taplo-cli = callPackage ../development/tools/taplo-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
-  taplo-lsp = callPackage ../development/tools/taplo-lsp {
+  taplo = callPackage ../development/tools/taplo {
     inherit (darwin.apple_sdk.frameworks) Security;
   };