Merge pull request #106691 from risicle/ris-hal-hardware-analyzer-3.1.9

hal-hardware-analyzer: 2.0.0 -> 3.1.9
This commit is contained in:
Robert Scott 2020-12-12 01:15:41 +00:00 committed by GitHub
commit 41c8f3c356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -1,28 +1,28 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
, fmt, llvmPackages ? null
, fmt, graphviz, llvmPackages ? null
}:
stdenv.mkDerivation rec {
version = "2.0.0";
version = "3.1.9";
pname = "hal-hardware-analyzer";
src = fetchFromGitHub {
owner = "emsec";
repo = "hal";
rev = "v${version}";
sha256 = "11xmqxnryksl645wmm1d69k1b5zwvxxf0admk4iblzaa3ggf7cv1";
sha256 = "0yvvlx0hq73x20va4csa8kyx3x4z648s6l6qqirzjpmxa1w91xc6";
};
# make sure bundled dependencies don't get in the way - install also otherwise
# copies them in full to the output, bloating the package
postPatch = ''
rm -rf deps/*/*
substituteInPlace cmake/detect_dependencies.cmake \
--replace 'spdlog 1.4.2 EXACT' 'spdlog 1.4.2 REQUIRED'
shopt -s extglob
rm -rf deps/!(sanitizers-cmake)/*
shopt -u extglob
'';
nativeBuildInputs = [ cmake ninja pkgconfig ];
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt wrapQtAppsHook ]
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ]
++ (with python3Packages; [ python pybind11 ])
++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;

View file

@ -4603,7 +4603,7 @@ in
hal-flash = callPackage ../os-specific/linux/hal-flash { };
hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
half = callPackage ../development/libraries/half { };