From e84435878ca0555f927c00c54f83c0de179d0c2a Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 19 Jul 2022 13:55:33 +0200 Subject: [PATCH 1/2] metals: 0.11.6 -> 0.11.7 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 45ea829299a0..4154eb4623ee 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -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 ]; From f49a09b5a2effde9bc1cdbab8133935a9ab3b9ea Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 19 Jul 2022 21:51:19 +0200 Subject: [PATCH 2/2] metals: remove client specific wrappers --- pkgs/development/tools/metals/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4154eb4623ee..27e8ec08752a 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -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; {