From 4fa5f7334a83dbfc8da2a0d5188d7703f8227222 Mon Sep 17 00:00:00 2001 From: Madoura Date: Tue, 10 Oct 2023 22:47:41 -0500 Subject: [PATCH] rapidjson-unstable: init at unstable-2023-09-28 Also correct rapidjson's src owner --- .../libraries/rapidjson/default.nix | 2 +- .../libraries/rapidjson/unstable.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/rapidjson/unstable.nix diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index d3233384d3eb..0a6a7a9b9704 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchFromGitHub { - owner = "miloyip"; + owner = "Tencent"; repo = "rapidjson"; rev = "v${version}"; sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; diff --git a/pkgs/development/libraries/rapidjson/unstable.nix b/pkgs/development/libraries/rapidjson/unstable.nix new file mode 100644 index 000000000000..069f1a48e0ea --- /dev/null +++ b/pkgs/development/libraries/rapidjson/unstable.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, cmake +, gtest +, valgrind +}: + +stdenv.mkDerivation rec { + pname = "rapidjson"; + version = "unstable-2023-09-28"; + + src = fetchFromGitHub { + owner = "Tencent"; + repo = "rapidjson"; + rev = "f9d53419e912910fd8fa57d5705fa41425428c35"; + hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + patches = [ + (fetchpatch { + name = "do-not-include-gtest-src-dir.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; + hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; + }) + ]; + + # for tests, adding gtest to checkInputs does not work + # https://github.com/NixOS/nixpkgs/pull/212200 + buildInputs = [ gtest ]; + cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ]; + + nativeCheckInputs = [ valgrind ]; + doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ Madouura ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4bbb17ad2a..9108d62c8da5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24699,6 +24699,8 @@ with pkgs; rapidjson = callPackage ../development/libraries/rapidjson { }; + rapidjson-unstable = callPackage ../development/libraries/rapidjson/unstable.nix { }; + rapidxml = callPackage ../development/libraries/rapidxml { }; rapidyaml = callPackage ../development/libraries/rapidyaml {};