Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 709a60a04568
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f716779c1f34
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 5, 2021

  1. Revert "Use upstream nlohmann_json" 

    This reverts commit 4145cd2.
    @cgohla
    cgohla committed Apr 5, 2021
    Copy the full SHA
    9f28dd9 View commit details

  2. Revert "[prerequisites]: add JSON lib dependency" 

    This reverts commit 5926200.
    @cgohla
    cgohla committed Apr 5, 2021
    Copy the full SHA
    4d9568e View commit details

Commits on Apr 15, 2021

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

    @edolstra
    edolstra committed Apr 15, 2021
    Copy the full SHA
    f716779 View commit details
Showing with 20,406 additions and 3 deletions.
  1. +0 −3 doc/manual/src/installation/prerequisites-source.md
  2. +20,406 −0 src/nlohmann/json.hpp
3 changes: 0 additions & 3 deletions doc/manual/src/installation/prerequisites-source.md
View file
Original file line number Diff line number Diff line change
@@ -69,6 +69,3 @@
`--disable-seccomp-sandboxing` option to the `configure` script (Not
recommended unless your system doesn't support `libseccomp`). To get
the library, visit <https://github.com/seccomp/libseccomp>.

- Niels Lohmann's [JSON library](https://github.com/nlohmann/json).

20,406 changes: 20,406 additions & 0 deletions src/nlohmann/json.hpp
View file

Large diffs are not rendered by default.