From 48404dfa1950e62672c0465f41962a494ce97826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Fri, 18 Nov 2022 11:57:56 +0100
Subject: [PATCH] nix: use latest batsim and simgrid because the bug of issue#2
was fixed in simgrid-3.32
---
default.nix | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/default.nix b/default.nix
index de555e8..847d201 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
];
};
};
--
GitLab