emacs.pkgs.tsc: Remove with from top-level scope

This is a huge anti-pattern that makes it next to impossible to know
which attrset is providing which attr and it's very easy to make mistakes.

Case in point: This package didn't properly scope `lib.maintainers`.
This commit is contained in:
adisbladis 2022-04-23 22:46:58 +12:00
parent 48b6b19970
commit 4567405cd4

View File

@ -7,9 +7,6 @@
, clang , clang
, llvmPackages , llvmPackages
}: }:
with lib.licenses;
with rustPlatform;
with llvmPackages;
let let
version = "0.16.1"; version = "0.16.1";
@ -37,7 +34,7 @@ let
''; '';
}; };
tsc-dyn = buildRustPackage { tsc-dyn = rustPlatform.buildRustPackage {
inherit version; inherit version;
inherit src; inherit src;
@ -47,7 +44,7 @@ let
sourceRoot = "source/core"; sourceRoot = "source/core";
configurePhase = '' configurePhase = ''
export LIBCLANG_PATH="${libclang.lib}/lib" export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
''; '';
postInstall = '' postInstall = ''
@ -61,13 +58,14 @@ let
cargoSha256 = "sha256-7UOhs3wx6fGvqPjNxUKoEHwPtiJ5zgLFPwDSvhYlmis="; cargoSha256 = "sha256-7UOhs3wx6fGvqPjNxUKoEHwPtiJ5zgLFPwDSvhYlmis=";
}; };
in symlinkJoin { in symlinkJoin {
name = "tsc"; name = "tsc-${version}";
paths = [ tsc tsc-dyn ]; paths = [ tsc tsc-dyn ];
meta = { meta = {
description = "The core APIs of the Emacs binding for tree-sitter."; description = "The core APIs of the Emacs binding for tree-sitter.";
license = mit; license = lib.licenses.mit;
maintainers = with maintainers; [ pimeys ]; maintainers = with lib.maintainers; [ pimeys ];
}; };
} }