diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-11-29 08:02:06 +0000 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-12-01 02:22:36 +0000 |
| commit | 235e16e90f0fd324615eb290c4a2448df1c9ceab (patch) | |
| tree | 33b383694f77093fed86ffda71ae687cfbaa4cdc /pkgs/development/libraries/nlohmann_json | |
| parent | 5f3a2d687ef2b9b04184062f899a881851b07747 (diff) | |
nlohmann_json: 3.11.2 -> 3.11.3
Changes: https://github.com/nlohmann/json/releases/tag/v3.11.3
Diffstat (limited to 'pkgs/development/libraries/nlohmann_json')
| -rw-r--r-- | pkgs/development/libraries/nlohmann_json/default.nix | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 29c7ca2c690bf..6f3ce7b3c5fea 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake }: let @@ -13,33 +12,15 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${finalAttrs.version}"; - hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; + hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; }; - patches = [ - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3895 - (fetchpatch { - name = "gcc-13-rebind.patch"; - url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; - hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; - }) - - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3950 - (fetchpatch { - name = "gcc-13-eq-op.patch"; - url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; - hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ |