forked from mirrors/nixpkgs
Merge pull request #61462 from mpoquet/simgrid-3.21-to-3.22.2
simgrid: 3.21 -> 3.22.2
This commit is contained in:
commit
8b3350cf15
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind
|
||||
{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind
|
||||
# Optional requirements
|
||||
# Lua 5.3 needed and not available now
|
||||
#, luaSupport ? false, lua5
|
||||
|
@ -17,14 +17,15 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "simgrid-${version}";
|
||||
version = "3.21";
|
||||
pname = "simgrid";
|
||||
version = "3.22.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simgrid";
|
||||
repo = "simgrid";
|
||||
rev = "v${replaceChars ["."] ["_"] version}";
|
||||
sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs";
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl python3 boost valgrind ]
|
||||
|
@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
# - lua53: for enable_lua
|
||||
#
|
||||
# For more information see:
|
||||
# http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
|
||||
# https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options)
|
||||
cmakeFlags= ''
|
||||
-Denable_documentation=${optionOnOff buildDocumentation}
|
||||
-Denable_java=${optionOnOff buildJavaBindings}
|
||||
|
@ -84,12 +85,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple
|
||||
|
||||
runHook postCheck
|
||||
# Prevent the execution of tests known to fail.
|
||||
preCheck = ''
|
||||
cat <<EOW >CTestCustom.cmake
|
||||
SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple)
|
||||
EOW
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
Loading…
Reference in a new issue