diff --git a/default.nix b/default.nix index de555e8efd7a23d7c24062fb6680c3e1d4754634..847d2014e35ae5616c5aed4b33a14b78bd2775df 100644 --- a/default.nix +++ b/default.nix @@ -44,27 +44,13 @@ let ''; }); - simgrid-pinned = kapack.simgrid.overrideAttrs(old: rec { - version = "e95fe51a7a87a360f8e6c1b27e14fbf60b0078b8"; - src = kapack.pkgs.fetchgit rec { - url = "https://framagit.org/simgrid/simgrid.git"; - rev = version; - sha256 = "1psksbw8kp3lxax0161sikk455svhabgby4xwbm5kj83ivlyrz8q"; - }; - patches = []; - doCheck = false; - }); - - batsim_sg-pinned = kapack.batsim.override { simgrid = simgrid-pinned; }; - batsim_sg330 = kapack.batsim.override { simgrid = kapack.simgrid-330light; }; - # Batmen integration tests. test = pkgs.mkShell rec { shellHook = '' export PATH="./build:$PATH" ''; buildInputs = with pythonPackages; [ - batsim_sg330 + batsim batexpe pytest pytest-html # for html export of test results @@ -74,11 +60,12 @@ let test_rebuild = pkgs.mkShell rec { buildInputs = with pythonPackages; [ - batsim_sg330 batmen + batsim batexpe pytest pytest-html + pandas ]; }; };