Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simgrid: 3.21 -> 3.22.2 #61462

Merged
merged 4 commits into from May 16, 2019
Merged

simgrid: 3.21 -> 3.22.2 #61462

merged 4 commits into from May 16, 2019

Conversation

mpoquet
Copy link
Contributor

@mpoquet mpoquet commented May 13, 2019

Motivation for this change

Keep nixpkgs's SimGrid up-to-date.

This commit does the following.

  • Update git repository. The SimGrid team uses Framagit more than GitHub now, and intermediate releases (as this one, 3.22.2) are not available on GitHub.
  • In checkPhase, explicitly compile test binaries thanks to make tests. This is now required as calling make without parameter no longer build test binaries.
  • Fix broken documentation link.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distribution (Arch + Nix)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

- GitHub -> Framagit (SimGrid main repo has moved)
- Test binaries must now be explicitly compiled (`make tests`)
- Fix broken documentation link
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
@aanderse
Copy link
Member

@GrahamcOfBorg build simgrid

@aanderse
Copy link
Member

aanderse commented May 15, 2019

@mpoquet Do you know if python bindings are working in the current version? When I built this locally I see -- Python libs not found. Turn pybind11 off. but I notice that python3 is included in the nativeBuildInputs.

@mpoquet
Copy link
Contributor Author

mpoquet commented May 16, 2019

@aanderse SimGrid integration tests execute the tesh SimGrid internal script, that runs a process and checks whether its output is the expected one. The Python dependency comes from tesh.

The python binding is experimental in SimGrid-3.22.2 — I'm part of the SimGrid dev team btw.
I tried to support the python binding in this package by adding the pybind11 dependency (patch), but a pybind11 test seems to fail in this case (log).

Additionally, explicitly setting -Denable_python=off still issues a warning due to a SimGrid CMake issue, so it just replaces a warning by another :(.

@aanderse
Copy link
Member

@mpoquet sounds good, just wanted to make sure. Thanks!

@aanderse aanderse merged commit 8b3350c into NixOS:master May 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants