From f640b0ec7c3d1f16cb8a75e4090e67fd014994c6 Mon Sep 17 00:00:00 2001 From: Henry Denny Date: Thu, 12 Oct 2023 10:03:03 +0100 Subject: [PATCH] Remove unnecessary HDF5 dependency from kafka-daq-report. --- Cargo.lock | 1 - flake.nix | 2 +- kafka-daq-report/Cargo.toml | 1 - kafka-daq-report/default.nix | 3 --- result | 2 +- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eab951ef..89e1d6e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -686,7 +686,6 @@ dependencies = [ "common", "crossterm", "env_logger", - "hdf5", "lazy_static", "log", "ndarray", diff --git a/flake.nix b/flake.nix index 9f366b25..db2130ee 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ packages = { events-to-histogram = import ./events-to-histogram { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; }; - kafka-daq-report = import ./kafka-daq-report { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; }; + kafka-daq-report = import ./kafka-daq-report { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; }; simulator = import ./simulator { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs; }; stream-to-file = import ./stream-to-file { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; }; trace-archiver = import ./trace-archiver { inherit pkgs naersk' version git_revision nativeBuildInputs buildInputs hdf5-joined; }; diff --git a/kafka-daq-report/Cargo.toml b/kafka-daq-report/Cargo.toml index df059d35..77861a10 100644 --- a/kafka-daq-report/Cargo.toml +++ b/kafka-daq-report/Cargo.toml @@ -13,7 +13,6 @@ chrono.workspace = true clap.workspace = true crossterm = "0.26.1" env_logger.workspace = true -hdf5.workspace = true lazy_static.workspace = true log.workspace = true ndarray.workspace = true diff --git a/kafka-daq-report/default.nix b/kafka-daq-report/default.nix index 269965b9..7e9482a8 100644 --- a/kafka-daq-report/default.nix +++ b/kafka-daq-report/default.nix @@ -5,7 +5,6 @@ git_revision, nativeBuildInputs, buildInputs, - hdf5-joined, } : { package = naersk'.buildPackage { name = "kafka-daq-report"; @@ -20,8 +19,6 @@ overrideMain = p: { GIT_REVISION = git_revision; }; - - HDF5_DIR = "${hdf5-joined}"; }; /* diff --git a/result b/result index d7a79efb..8b228906 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/lzjirhciy6bkg91y0y70gsmjbb7l2p43-trace-to-events-0.1.0 \ No newline at end of file +/nix/store/ddi6pcln49w4m67g6132r8bh52byw49i-kafka-daq-report-0.1.0 \ No newline at end of file