From 4c8f600eaa0b184b39f2525cc76b6d92c065343c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 7 Nov 2019 23:16:05 +0100
Subject: [PATCH] Update to latest Nix and fix compilation

---
 flake.lock | 12 ++++++------
 flake.nix  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 806f6d17..8d8b6741 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,20 +4,20 @@
             "inputs": {
                 "nixpkgs": {
                     "inputs": {},
-                    "narHash": "sha256-ALTr2z3J1mE/2OAuEIALIq5pxgADfKvq7rF7gqxT4c0=",
+                    "narHash": "sha256-ZzR2l1dovxeZ555KXxz7SAXrC72BfaR4BeqvJzRdmwQ=",
                     "originalUrl": "nixpkgs/release-19.09",
-                    "url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
+                    "url": "github:edolstra/nixpkgs/d37927a77e70a2b3408ceaa2e763b6df1f4d941a"
                 }
             },
-            "narHash": "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=",
+            "narHash": "sha256-jdPbZC16ky1nhh1P0E6RGnEjtDofgfbWXFn1v6GyYXA=",
             "originalUrl": "nix",
-            "url": "github:NixOS/nix/9cac895406724e0304dff140379783c4d786e855"
+            "url": "github:NixOS/nix/0ba8a4e942fbbc6ed71fa3aa76c6f923de3923ee"
         },
         "nixpkgs": {
             "inputs": {},
-            "narHash": "sha256-ALTr2z3J1mE/2OAuEIALIq5pxgADfKvq7rF7gqxT4c0=",
+            "narHash": "sha256-ZzR2l1dovxeZ555KXxz7SAXrC72BfaR4BeqvJzRdmwQ=",
             "originalUrl": "nixpkgs/release-19.09",
-            "url": "github:edolstra/nixpkgs/bcceb882ccdfa818c1e18f4c1e88f2db68964305"
+            "url": "github:edolstra/nixpkgs/d37927a77e70a2b3408ceaa2e763b6df1f4d941a"
         }
     },
     "version": 3
diff --git a/flake.nix b/flake.nix
index aa2c6762..acf1035c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,7 +110,7 @@
               perlDeps perl final.nix
               postgresql95 # for running the tests
               boost
-              nlohmann_json
+              (nlohmann_json.override { multipleHeaders = true; })
             ];
 
           hydraPath = lib.makeBinPath (