Merge pull request #131909 from figsoda/taplo

This commit is contained in:
Sandro 2021-08-02 07:59:30 +00:00 committed by GitHub
commit 0576bf5dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 0 deletions

View File

@ -0,0 +1,25 @@
{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "taplo-cli";
version = "0.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "0hh9l83z7qymakyf7ka756gwxpzirgdhf6kpzh89bcmpdfz70005";
};
cargoSha256 = "0bkpcnbrrfv07czs1gy8r9q1cp6fdfz2vmlfk9lsg3iapvyi5s1c";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optional stdenv.isLinux openssl
++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "A TOML toolkit written in Rust";
homepage = "https://taplo.tamasfe.dev";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -0,0 +1,28 @@
{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "taplo-lsp";
version = "0.2.4";
src = fetchCrate {
inherit pname version;
sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy";
};
cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc";
# excludes test_tcp since it fails
cargoTestFlags = [ "test_stdio" ];
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optional stdenv.isLinux openssl
++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "A TOML toolkit written in Rust";
homepage = "https://taplo.tamasfe.dev";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -14417,6 +14417,14 @@ in
stdenv = gccStdenv;
};
taplo-cli = callPackage ../development/tools/taplo-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
taplo-lsp = callPackage ../development/tools/taplo-lsp {
inherit (darwin.apple_sdk.frameworks) Security;
};
tcptrack = callPackage ../development/tools/misc/tcptrack { };
teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; };