Merge pull request #182087 from Tomahna/metals

metals: 0.11.6 -> 0.11.7
This commit is contained in:
Winter 2022-07-21 00:10:06 -04:00 committed by GitHub
commit 2e191eb7bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "0.11.6";
version = "0.11.7";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM=";
outputHash = "sha256-Zc/0kod3JM58WpyxwXiyQdixBHOJV7UDGg1YZtHJ3hw=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
@ -29,23 +29,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
# This variant is not targeted at any particular client, clients are
# expected to declare their supported features in initialization options.
makeWrapper ${jre}/bin/java $out/bin/metals \
--add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
# Further variants targeted at clients with featuresets pre-set.
makeWrapper ${jre}/bin/java $out/bin/metals-emacs \
--add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-vim \
--add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \
--add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main"
makeWrapper ${jre}/bin/java $out/bin/metals-sublime \
--add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main"
'';
meta = with lib; {