diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-24 23:46:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 23:46:45 +0000 |
| commit | ecaf3da9340231e5493eccc3db87604a3705da42 (patch) | |
| tree | 477a39ee6e2aeac14de05e3af5bb8d6ccf76b806 | |
| parent | 776255ac39cc20b61ee0c80105124a8198aa2c40 (diff) | |
| parent | 4a7e4dd6452146f537e008eac32ea796e41f4bd7 (diff) | |
| download | nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar.gz nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar.bz2 nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar.lz nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar.xz nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.tar.zst nixpkgs-ecaf3da9340231e5493eccc3db87604a3705da42.zip | |
Merge pull request #131404 from Stunkymonkey/scalafix-phases
scalafix: deprecate phases and use pname&version
| -rw-r--r-- | pkgs/development/tools/scalafix/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index c27d6e8a65f..666087e4f22 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -17,21 +17,20 @@ let }; in stdenv.mkDerivation { - name = "${baseName}-${version}"; + pname = baseName; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk deps ]; - doCheck = true; - - phases = [ "installPhase" "checkPhase" ]; + dontUnpack = true; installPhase = '' makeWrapper ${jre}/bin/java $out/bin/${baseName} \ --add-flags "-cp $CLASSPATH scalafix.cli.Cli" ''; - checkPhase = '' + installCheckPhase = '' $out/bin/${baseName} --version | grep -q "${version}" ''; |