Update simgrid 3.19.1 -> 3.20 + parallel tests + enable darwin (#42721)
* simgrid: 3.19.1 -> 3.20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/simgrid/versions. These checks were done: - built on NixOS - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpicc passed the binary check. - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpicxx passed the binary check. - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpirun passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/tesh had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid-colorizer passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid_update_xml had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/simgrid_convert_TI_traces passed the binary check. - Warning: no invocation of /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/smpimain had a zero exit code or showed the expected version - /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20/bin/graphicator passed the binary check. - 6 of 9 passed binary check by having a zero exit code. - 4 of 9 passed binary check by having the new version present in output. - found 3.20 with grep in /nix/store/cvyi6hvgc9rvgrnp7c028xrlzbl7jzb9-simgrid-3.20 - directory tree listing: https://gist.github.com/edefc2f1a2e81412484edc2e45986e03 - du listing: https://gist.github.com/a44f7d57537e93152a8e6c569f8ed1ae * simgrid: 3.19.1 -> 3.20 + add darwin - Fix dependencies to enable build on darwin - Add ctest flag to enable parallel testing * Use simpler parallel testing logic because it is already done in nixpkgs/pkgs/stdenv/generic/setup.sh
This commit is contained in:
parent
22c15abe20
commit
b8566965df
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind
|
{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind
|
||||||
# Optional requirements
|
# Optional requirements
|
||||||
# Lua 5.3 needed and not available now
|
# Lua 5.3 needed and not available now
|
||||||
#, luaSupport ? false, lua5
|
#, luaSupport ? false, lua5
|
||||||
, fortranSupport ? false, gfortran
|
, fortranSupport ? false, gfortran
|
||||||
, buildDocumentation ? false, transfig, ghostscript, doxygen
|
, buildDocumentation ? false, transfig, ghostscript, doxygen
|
||||||
, buildJavaBindings ? false, openjdk
|
, buildJavaBindings ? false, openjdk
|
||||||
, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw
|
, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw
|
||||||
, debug ? false
|
, debug ? false
|
||||||
, moreTests ? false
|
, moreTests ? false
|
||||||
}:
|
}:
|
||||||
@ -18,20 +18,20 @@ in
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "simgrid-${version}";
|
name = "simgrid-${version}";
|
||||||
version = "3.19.1";
|
version = "3.20";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "simgrid";
|
owner = "simgrid";
|
||||||
repo = "simgrid";
|
repo = "simgrid";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih";
|
sha256 = "0xb20qhvsah2dz2hvn850i3w9a5ghsbcx8vka2ap6xsdkxf593gy";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ]
|
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
|
||||||
++ optionals fortranSupport [ gfortran ]
|
++ optionals fortranSupport [ gfortran ]
|
||||||
++ optionals buildJavaBindings [ openjdk ]
|
++ optionals buildJavaBindings [ openjdk ]
|
||||||
++ optionals buildDocumentation [ transfig ghostscript doxygen ]
|
++ optionals buildDocumentation [ transfig ghostscript doxygen ]
|
||||||
++ optionals modelCheckingSupport [ libunwind libevent ];
|
++ optionals modelCheckingSupport [ libunwind libevent elfutils ];
|
||||||
|
|
||||||
#buildInputs = optional luaSupport lua5;
|
#buildInputs = optional luaSupport lua5;
|
||||||
|
|
||||||
@ -83,13 +83,15 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
runHook preCheck
|
runHook preCheck
|
||||||
ctest --output-on-failure -E smpi-replay-multiple
|
|
||||||
|
ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple
|
||||||
|
|
||||||
runHook postCheck
|
runHook postCheck
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user