Remove unnecessary HDF5 dependency from kafka-daq-report.

STFC-ICD-Research-and-Design · Oct 12, 2023 · f640b0e · f640b0e
1 parent fd198f7
commit f640b0e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -1 +1 @@
-/nix/store/lzjirhciy6bkg91y0y70gsmjbb7l2p43-trace-to-events-0.1.0
+/nix/store/ddi6pcln49w4m67g6132r8bh52byw49i-kafka-daq-report-0.1.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/nix/store/lzjirhciy6bkg91y0y70gsmjbb7l2p43-trace-to-events-0.1.0
		/nix/store/ddi6pcln49w4m67g6132r8bh52byw49i-kafka-daq-report-0.1.0