Merge branch 'revertRemoveJSON' of https://github.com/cgohla/nix

This commit is contained in:
Eelco Dolstra 2021-04-15 13:26:56 +02:00
commit f716779c1f
2 changed files with 20406 additions and 3 deletions

View file

@ -69,6 +69,3 @@
`--disable-seccomp-sandboxing` option to the `configure` script (Not `--disable-seccomp-sandboxing` option to the `configure` script (Not
recommended unless your system doesn't support `libseccomp`). To get recommended unless your system doesn't support `libseccomp`). To get
the library, visit <https://github.com/seccomp/libseccomp>. the library, visit <https://github.com/seccomp/libseccomp>.
- Niels Lohmann's [JSON library](https://github.com/nlohmann/json).

20406
src/nlohmann/json.hpp Normal file

File diff suppressed because it is too large Load diff