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/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a6513979f7e1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4023852c3bb8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2019

  1. nlohmann_json: disable tests for now since they timeout 

    (cherry picked from commit 7456f19)
    @davidak
    davidak committed Nov 6, 2019
    Copy the full SHA
    9dc6fc3 View commit details

  2. Merge pull request #72944 from davidak/nlohmann_json_disable_tests_19.09 

    Backport nlohmann_json: disable tests for now since they timeout
    @grahamc
    grahamc authored Nov 6, 2019
    Copy the full SHA
    4023852 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/libraries/nlohmann_json/default.nix
4 changes: 3 additions & 1 deletion pkgs/development/libraries/nlohmann_json/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
[ "-DBuildTests=${if doCheck then "ON" else "OFF"}" ]
++ stdenv.lib.optional multipleHeaders "-DJSON_MultipleHeaders=ON";

doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
# A test cause the build to timeout https://github.com/nlohmann/json/issues/1816
#doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = false;

meta = with stdenv.lib; {
description = "Header only C++ library for the JSON file format";