Unverified Commit 66e419a7 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

taplo: rename from taplo-{cli,lsp}, 0.6.2 -> 0.6.9
parents 1f260ae9 e517b841

pkgs/development/tools/taplo-cli/default.nix→pkgs/development/tools/taplo/default.nix

+16 −7
Original line number Diff line number Diff line 
{ 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";

  };

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -16778,11 +16778,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;















  };