From e66d3c1d562727d7d265d8629e8a042199495604 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 25 Jul 2021 01:21:45 +0200 Subject: [PATCH] scalafmt: deprecate phases and use pname&version --- pkgs/development/tools/scalafmt/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 45efd813a38..0565127f8d0 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -17,21 +17,24 @@ let }; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + pname = baseName; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - doCheck = true; - - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH org.scalafmt.cli.Cli" + + runHook postInstall ''; - checkPhase = '' + installCheckPhase = '' $out/bin/${baseName} --version | grep -q "${version}" '';