diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/nlohmann_json | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/nlohmann_json')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index d8ae8fcaa4ae..ec4df7927f2b 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -10,23 +10,23 @@ let rev = "v3.0.0"; sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.10.2"; + version = "3.10.5"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; - rev = "v${version}"; - sha256 = "/OFNfukrIyfJmD0ko174aud9T6ZOesHANJjyfk4q/Vs="; + rev = "v${finalAttrs.version}"; + sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBuildTests=${if doCheck then "ON" else "OFF"}" + "-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -44,4 +44,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} +}) |