From db5290358104764155c53235394a07608d7fcf75 Mon Sep 17 00:00:00 2001
From: Michael Reilly <OmnipotentEntity@gmail.com>
Date: Sat, 19 Sep 2020 10:46:02 -0400
Subject: feat(tvix): Bump nlohmann-json version to 3.9.1

Backporting from upstream at d860295e116f9aa0f37e2637b5ec4b9c86fdf4d3

Change-Id: Iefde47ff6f24d21e9b37c9b52a615bd8c9f2fdb2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2141
Tested-by: BuildkiteCI
Reviewed-by: andi <andi@notmuch.email>
---
 third_party/nix/src/libexpr/json-to-value.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'third_party/nix')

diff --git a/third_party/nix/src/libexpr/json-to-value.cc b/third_party/nix/src/libexpr/json-to-value.cc
index 66912aa084e6..043f8c64cd30 100644
--- a/third_party/nix/src/libexpr/json-to-value.cc
+++ b/third_party/nix/src/libexpr/json-to-value.cc
@@ -106,6 +106,14 @@ class JSONSax : nlohmann::json_sax<json> {
     return handle_value<void(Value&, const char*)>(mkString, val.c_str());
   }
 
+#if NLOHMANN_JSON_VERSION_MAJOR >= 3 && NLOHMANN_JSON_VERSION_MINOR >= 8
+  bool binary(binary_t&) {
+    // This function ought to be unreachable
+    assert(false);
+    return true;
+  }
+#endif
+
   bool start_object(std::size_t) override {
     rs = std::make_unique<JSONObjectState>(std::move(rs));
     return true;
-- 
cgit 1.4.1