NixOS · Nov 7, 2019 · Nov 7, 2019
Showing with 3 additions and 20,408 deletions.

+1 −0 release-common.nix

+2 −2 release.nix

+0 −20,406 src/nlohmann/json.hpp
diff --git a/release-common.nix b/release-common.nix
@@ -50,6 +50,7 @@ rec {
       bzip2 xz brotli editline
       openssl pkgconfig sqlite boehmgc
       boost
+      nlohmann_json
 
       # Tests
       git

diff --git a/release.nix b/release.nix
@@ -200,7 +200,7 @@ let
 
         doInstallCheck = true;
 
-        lcovFilter = [ "*/boost/*" "*-tab.*" "*/nlohmann/*" "*/linenoise/*" ];
+        lcovFilter = [ "*/boost/*" "*-tab.*" ];
 
         # We call `dot', and even though we just use it to
         # syntax-check generated dot files, it still requires some
@@ -300,7 +300,7 @@ let
 
           substitute ${./scripts/install.in} $out/install \
             ${pkgs.lib.concatMapStrings
-              (system: "--replace '@binaryTarball_${system}@' $(nix hash-file --base16 --type sha256 ${binaryTarball.${system}}/*.tar.xz) ")
+              (system: "--replace '@binaryTarball_${system}@' $(nix --experimental-features nix-command hash-file --base16 --type sha256 ${binaryTarball.${system}}/*.tar.xz) ")
               [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
             } \
             --replace '@nixVersion@' ${build.x86_64-linux.src.version}

diff --git a/src/nlohmann/json.hpp b/src/nlohmann/json.hpp