public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hal-hardware-analyzer: 2.0.0 -> 3.1.9

This commit is contained in:
Robert Scott 2020-12-11 22:02:45 +00:00
parent 46131f0e4b
commit d81a6bb6f2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -4603,7 +4603,7 @@ in
hal-flash = callPackage ../os-specific/linux/hal-flash { }; 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 { }; half = callPackage ../development/libraries/half { };