diff options
| author | Robert Scott <code@humanleg.org.uk> | 2020-12-12 01:15:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-12 01:15:41 +0000 |
| commit | 41c8f3c356ea8af2c3db3c83bc8a64416f641b58 (patch) | |
| tree | 52a5c63b5c30c9b055b33dcde8a0ed3efcd8815a /pkgs | |
| parent | c60bf872c4adf69f6e675903cda0de95abbd74f2 (diff) | |
| parent | d81a6bb6f2f45beaf87e38528c25be4e3c0614a3 (diff) | |
Merge pull request #106691 from risicle/ris-hal-hardware-analyzer-3.1.9
hal-hardware-analyzer: 2.0.0 -> 3.1.9
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c0a2ddb7a091..896a2a010844 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9b4e34c0aec..0c7c2919ec3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |