From c7ab2b94994a05cb9a2abd768b5ffda6710ecc73 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 18:58:27 +0200 Subject: [PATCH 1/4] 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 --- .../science/misc/simgrid/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 0b663b2fb63b..e04b8da980bb 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind +{ stdenv, fetchgit, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -18,13 +18,12 @@ in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.21"; + version = "3.22.2"; - src = fetchFromGitHub { - owner = "simgrid"; - repo = "simgrid"; - rev = "v${replaceChars ["."] ["_"] version}"; - sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs"; + src = fetchgit { + url = "https://framagit.org/simgrid/simgrid.git"; + rev = "v${version}"; + sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -52,7 +51,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} @@ -87,6 +86,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + make tests -j $NIX_BUILD_CORES ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple runHook postCheck From aa29b79e8a2c8ff7b51fb3ae801f4f19ff159d48 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 21:26:09 +0200 Subject: [PATCH 2/4] simgrid: fetchgit -> fetchFromGitLab --- pkgs/applications/science/misc/simgrid/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index e04b8da980bb..43b6f294cdce 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, 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,13 +17,16 @@ let in stdenv.mkDerivation rec { - name = "simgrid-${version}"; + pname = "simgrid"; version = "3.22.2"; + name = "${pname}-${version}"; - src = fetchgit { - url = "https://framagit.org/simgrid/simgrid.git"; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; + sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] From 00fc5bd08fc7c5149c50895a5f5d15e9db171c02 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 14 May 2019 18:27:51 +0200 Subject: [PATCH 3/4] simgrid: override checkPhase -> preCheck This commit changes how failing tests are ignored. - Previously, the whole checkPhase was overridden. - Now, preCheck generates a ctest ignore file. ctest doc: https://gitlab.kitware.com/cmake/community/wikis/doc/ctest/Testing-With-CTest#customizing-ctest --- pkgs/applications/science/misc/simgrid/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 43b6f294cdce..5272e3d84185 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -86,13 +86,11 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - make tests -j $NIX_BUILD_CORES - ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple - - runHook postCheck + # Prevent the execution of tests known to fail. + preCheck = '' + cat <CTestCustom.cmake + SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) + EOW ''; enableParallelBuilding = true; From 13aa449bab532d6223a9e35841de7bb48a7d4cae Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Wed, 15 May 2019 12:35:12 +0200 Subject: [PATCH 4/4] simgrid: remove unneeded 'name' definition --- pkgs/applications/science/misc/simgrid/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5272e3d84185..554ef695a4ac 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -19,7 +19,6 @@ in stdenv.mkDerivation rec { pname = "simgrid"; version = "3.22.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { domain = "framagit.org";