From dae9c71893f62fb84dc95d9842d11f01e27fbd2c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Feb 2021 15:42:50 +0000 Subject: [PATCH] =?UTF-8?q?scala=5F2=5F13:=202.13.4=20=E2=86=92=202.13.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/scala/2.x.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index d3fa31ddd94b..93eff278dc09 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests +{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils , writeScript, common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: with lib; @@ -26,8 +26,8 @@ let }; "2.13" = { - version = "2.13.4"; - sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; + version = "2.13.5"; + sha256 = "1ah5rw6xqksiayi5i95r3pcff961q71ilishzn2kmg673z0j2b7d"; pname = "scala_2_13"; }; }; @@ -49,20 +49,22 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out - rm bin/*.bat - mv * $out - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/${name} - mv $out/man $out/share/man + runHook preInstall + mkdir -p $out + rm bin/*.bat + mv * $out + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/${name} + mv $out/man $out/share/man for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" ${coreutils}/bin \ --prefix PATH ":" ${gnugrep}/bin \ --prefix PATH ":" ${jre}/bin \ --set JAVA_HOME ${jre} - done + done + runHook postInstall ''; doInstallCheck = true;