diff options
| author | Kévin Rauscher <kevin.rauscher@tomahna.fr> | 2022-05-03 02:40:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 21:40:48 -0500 |
| commit | 24c33ab7952544ad355d0677c9eea931b23f371c (patch) | |
| tree | 29e6f548f6bb4621d9f3ac8785cbe1110463c400 | |
| parent | scalafix: 0.9.0 -> 0.10.0, completions, setup-hook instead of jdk (#171074) (diff) | |
| download | nixpkgs-24c33ab7952544ad355d0677c9eea931b23f371c.tar.gz | |
metals: 0.11.2 -> 0.11.4 (#171127)
| -rw-r--r-- | pkgs/development/tools/metals/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a4fd0ee23380..b7e8eca1b831 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, coursier, jdk, jre, makeWrapper }: +{ stdenv, lib, coursier, jre, makeWrapper, setJavaClassPath }: stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.2"; + version = "0.11.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/cs fetch org.scalameta:metals_2.12:${version} \ + ${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \ -r bintray:scalacenter/releases \ -r sonatype:snapshots > deps mkdir -p $out/share/java @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; + outputHash = "sha256-ZHl+uqYTSMEMR1CSo0btxEn/NQz7MNwh4JISm2L5B3Y="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk deps ]; + nativeBuildInputs = [ makeWrapper setJavaClassPath ]; + buildInputs = [ deps ]; dontUnpack = true; @@ -32,24 +32,19 @@ stdenv.mkDerivation rec { # 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 \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --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 \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-vim \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main" makeWrapper ${jre}/bin/java $out/bin/metals-sublime \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" ''; |