public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61462 from mpoquet/simgrid-3.21-to-3.22.2

Browse Source 
simgrid: 3.21 -> 3.22.2
This commit is contained in:
Aaron Andersen 2019-05-16 12:04:44 -04:00 committed by GitHub
commit 8b3350cf15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/science/misc/simgrid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind { stdenv, fetchFromGitLab, 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
@ -17,14 +17,15 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "simgrid-${version}"; pname = "simgrid";
version = "3.21"; version = "3.22.2";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "simgrid"; domain = "framagit.org";
repo = "simgrid"; owner = pname;
rev = "v${replaceChars ["."] ["_"] version}"; repo = pname;
sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs"; rev = "v${version}";
sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p";
}; };
nativeBuildInputs = [ cmake perl python3 boost valgrind ] nativeBuildInputs = [ cmake perl python3 boost valgrind ]
@ -52,7 +53,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}
@ -84,12 +85,11 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = '' # Prevent the execution of tests known to fail.
runHook preCheck preCheck = ''
cat <<EOW >CTestCustom.cmake
ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple)
EOW
runHook postCheck
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;