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>
This commit is contained in:
parent
568398e338
commit
50c509ecf3
|
@ -7,20 +7,33 @@
|
|||
, libuuid
|
||||
, openjdk11
|
||||
, gperftools
|
||||
, flatbuffers
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surelog";
|
||||
version = "1.40";
|
||||
version = "1.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chipsalliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k=";
|
||||
hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# This prevents race conditions in unit tests that surface since we run
|
||||
# ctest in parallel.
|
||||
# This patch can be removed with the next version of surelog
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
|
||||
sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
|
||||
name = "parallel-test-running.patch";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
@ -34,6 +47,11 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
libuuid
|
||||
gperftools
|
||||
flatbuffers
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
|
Loading…
Reference in a new issue