git.iko.soy/typeable/nixpkgs
on master help sign in
hal-hardware-analyzer: 2.0.0 -> 3.1.9
commitd81a6bb6f2f45beaf87e38528c25be4e3c0614a3 authorRobert Scott <code@humanleg.org.uk> dateFri 11 Dec 2020, 22:02 (6 years ago) parent46131f0
2 files changed+8−8
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+7−7 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix+7−7
@@ -1,28 +1,28 @@
11{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
22, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
3−, fmt, llvmPackages ? null
3+, fmt, graphviz, llvmPackages ? null
44}:
55
66stdenv.mkDerivation rec {
7− version = "2.0.0";
7+ version = "3.1.9";
88 pname = "hal-hardware-analyzer";
99
1010 src = fetchFromGitHub {
1111 owner = "emsec";
1212 repo = "hal";
1313 rev = "v${version}";
14− sha256 = "11xmqxnryksl645wmm1d69k1b5zwvxxf0admk4iblzaa3ggf7cv1";
14+ sha256 = "0yvvlx0hq73x20va4csa8kyx3x4z648s6l6qqirzjpmxa1w91xc6";
1515 };
1616 # make sure bundled dependencies don't get in the way - install also otherwise
1717 # copies them in full to the output, bloating the package
1818 postPatch = ''
19− rm -rf deps/*/*
20− substituteInPlace cmake/detect_dependencies.cmake \
21− --replace 'spdlog 1.4.2 EXACT' 'spdlog 1.4.2 REQUIRED'
19+ shopt -s extglob
20+ rm -rf deps/!(sanitizers-cmake)/*
21+ shopt -u extglob
2222 '';
2323
2424 nativeBuildInputs = [ cmake ninja pkgconfig ];
25− buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt wrapQtAppsHook ]
25+ buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ]
2626 ++ (with python3Packages; [ python pybind11 ])
2727 ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;
2828
pkgs/top-level/all-packages.nix+1−1
@@ -4603,7 +4603,7 @@ in
46034603
46044604 hal-flash = callPackage ../os-specific/linux/hal-flash { };
46054605
4606− hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
4606+ hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
46074607
46084608 half = callPackage ../development/libraries/half { };
46094609