pyrox.dev
lol
surelog: 1.40 -> 1.45
Update Surelog (going along with uhdm 1.45). Fix flaky tests
to to parallel execution of ctest by patching in a fix that is
already upstream.
Result zero hydra failures #199919
Also: using flatbuffers from nix environment instead of third_party/
Signed-off-by: Henner Zeller <h.zeller@acm.org>
+20
-2
+20
-2
pkgs/applications/science/logic/surelog/default.nix
+20
-2
pkgs/applications/science/logic/surelog/default.nix
···
7
7
, libuuid
8
8
, openjdk11
9
9
, gperftools
10
+
, flatbuffers
11
+
, fetchpatch
10
12
}:
11
13
12
14
stdenv.mkDerivation rec {
13
15
pname = "surelog";
14
-
version = "1.40";
16
+
version = "1.45";
15
17
16
18
src = fetchFromGitHub {
17
19
owner = "chipsalliance";
18
20
repo = pname;
19
21
rev = "v${version}";
20
-
hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k=";
22
+
hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
21
23
fetchSubmodules = true;
22
24
};
23
25
26
+
# This prevents race conditions in unit tests that surface since we run
27
+
# ctest in parallel.
28
+
# This patch can be removed with the next version of surelog
29
+
patches = [
30
+
(fetchpatch {
31
+
url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
32
+
sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
33
+
name = "parallel-test-running.patch";
34
+
})
35
+
];
36
+
24
37
nativeBuildInputs = [
25
38
cmake
26
39
pkg-config
···
34
47
buildInputs = [
35
48
libuuid
36
49
gperftools
50
+
flatbuffers
51
+
];
52
+
53
+
cmakeFlags = [
54
+
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
37
55
];
38
56
39
57
doCheck = true;