neoload: upgrade to 4.1.0

+14 -12
+14 -12
pkgs/development/tools/neoload/default.nix
··· 1 - { stdenv, fetchurl, writeTextFile, oraclejre, makeWrapper, licenseAccepted ? false }: 1 + { stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }: 2 2 3 3 # If you happen to use this software on the XMonad window manager, you will have issues with 4 4 # grey windows, no resizing, menus not showing and other glitches. ··· 12 12 '' 13 13 else assert licenseAccepted; 14 14 15 - # the installer is very picky and demands 1.6.0.29 15 + # the installer is very picky and demands 1.7.0.07 16 16 let dotInstall4j = writeTextFile { name = "dot-install4j"; text = '' 17 - JRE_VERSION ${oraclejre} 1 6 0 29 18 - JRE_INFO ${oraclejre} 0 17 + JRE_VERSION ${jre} 1 7 0 7 18 + JRE_INFO ${jre} 94 19 19 ''; }; 20 20 21 21 responseVarfile = writeTextFile { name = "response.varfile"; text = '' ··· 31 31 ''; }; 32 32 33 33 in stdenv.mkDerivation rec { 34 - name = "neoload-4.0.4"; 34 + name = "neoload-4.1.0"; 35 35 36 36 src = fetchurl ( 37 37 if stdenv.system == "x86_64-linux" then 38 - { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x64.sh; 39 - sha256 = "1w5pqik1998irpamx6y4rf2v5v34nm8xm6cwa1a8j0agawv992w2"; } 38 + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x64.sh; 39 + sha256 = "07r2pkspdylwi1ba36mqswxsz0xadkw6qn59ljkyw2hsvazd2824"; } 40 40 else 41 - { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x86.sh; 42 - sha256 = "0k49kcwnimax9q7d2kychcbhh4zlixlx4ak9jgrm901zpkhw2f3b"; } ); 41 + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_0_linux_x86.sh; 42 + sha256 = "1sd6fc35881dqr8m8qsgbblsfx97agam50w9iasd9hxmws7n6pfs"; } ); 43 43 44 44 buildInputs = [ makeWrapper ]; 45 45 phases = [ "installPhase" ]; ··· 47 47 # TODO: load generator / monitoring agent only builds 48 48 49 49 installPhase = '' 50 + mkdir -p $out/lib/neoload 51 + ln -s ${jre} $out/lib/neoload/jre 52 + 50 53 # the installer wants to use its internal JRE 51 54 # disable this. The extra spaces are needed because the installer carries 52 55 # a binary payload, so should not change in size ··· 59 62 sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile 60 63 61 64 export HOME=`pwd` 62 - export INSTALL4J_JAVA_HOME=${oraclejre} 63 - ./installer -q -varfile response.varfile 65 + export INSTALL4J_JAVA_HOME=${jre} 66 + bash -ic './installer -q -varfile response.varfile' 64 67 65 68 for i in $out/bin/*; do 66 69 wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \ ··· 74 77 done 75 78 rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall 76 79 77 - ln -s ${oraclejre}/bin $out/lib/neoload/jre 78 80 ''; 79 81 80 82 meta = {