simgrid: 3.21 -> 3.22.2

- GitHub -> Framagit (SimGrid main repo has moved)
- Test binaries must now be explicitly compiled (`make tests`)
- Fix broken documentation link
This commit is contained in:
Millian Poquet 2019-05-13 18:58:27 +02:00
parent 7b89adb493
commit c7ab2b9499

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind { stdenv, fetchgit, 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
@ -18,13 +18,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simgrid-${version}"; name = "simgrid-${version}";
version = "3.21"; version = "3.22.2";
src = fetchFromGitHub { src = fetchgit {
owner = "simgrid"; url = "https://framagit.org/simgrid/simgrid.git";
repo = "simgrid"; rev = "v${version}";
rev = "v${replaceChars ["."] ["_"] version}"; sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms";
sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs";
}; };
nativeBuildInputs = [ cmake perl python3 boost valgrind ] nativeBuildInputs = [ cmake perl python3 boost valgrind ]
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
# - lua53: for enable_lua # - lua53: for enable_lua
# #
# For more information see: # 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= '' cmakeFlags= ''
-Denable_documentation=${optionOnOff buildDocumentation} -Denable_documentation=${optionOnOff buildDocumentation}
-Denable_java=${optionOnOff buildJavaBindings} -Denable_java=${optionOnOff buildJavaBindings}
@ -87,6 +86,7 @@ stdenv.mkDerivation rec {
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck
make tests -j $NIX_BUILD_CORES
ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple
runHook postCheck runHook postCheck