From dfab218b9b6920f3db90b193f3961c1fbf509597 Mon Sep 17 00:00:00 2001
From: Jack Gerrits <jack@jackgerrits.com>
Date: Thu, 1 Apr 2021 13:46:09 -0400
Subject: [PATCH] vowpal-wabbit: 8.9.2 -> 8.10.0

---
 .../machine-learning/vowpal-wabbit/default.nix   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
index 771d6227a86..de6f9212983 100644
--- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
+++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
@@ -1,27 +1,33 @@
-{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "vowpal-wabbit";
-  version = "8.9.2";
+  version = "8.10.0";
 
   src = fetchFromGitHub {
     owner = "VowpalWabbit";
     repo = "vowpal_wabbit";
     rev = version;
-    sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd";
+    sha256 = "1vxnwanflsx6zf8m9mrxms28ii7rl61xfxp3556y3iawmy11d6pl";
   };
 
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
     boost169
+    flatbuffers
+    fmt
     rapidjson
+    spdlog
     zlib
   ];
 
   # -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
   # cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
   # this is the equivalent flag.
+  # Flatbuffers are an optional feature.
+  # BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a
+  # system dependency
   cmakeFlags = [
     "-DVW_INSTALL=ON"
     "-DBUILD_TESTS=OFF"
@@ -29,10 +35,12 @@ stdenv.mkDerivation rec {
     "-DBUILD_PYTHON=OFF"
     "-DUSE_LATEST_STD=ON"
     "-DRAPIDJSON_SYS_DEP=ON"
+    "-DFMT_SYS_DEP=ON"
+    "-DSPDLOG_SYS_DEP=ON"
+    "-DBUILD_FLATBUFFERS=ON"
   ];
 
   meta = with lib; {
-    broken = stdenv.isAarch32 || stdenv.isAarch64;
     description = "Machine learning system focused on online reinforcement learning";
     homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
     license = licenses.bsd3;