From 1469a6fa74273df754cffae5a136f0686ecc6b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 6 Aug 2024 09:10:31 -0700 Subject: [PATCH] python312Packages.python-rapidjson: 1.18 -> 1.20 Diff: https://github.com/python-rapidjson/python-rapidjson/compare/refs/tags/v1.18...v1.20 Changelog: https://github.com/python-rapidjson/python-rapidjson/blob/refs/tags/v1.20/CHANGES.rst --- .../python-rapidjson/default.nix | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 3ea015c19d51..6a631e49875e 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, rapidjson, pytestCheckHook, @@ -11,26 +10,8 @@ substituteAll, }: -let - rapidjson' = rapidjson.overrideAttrs (old: { - version = "unstable-2023-03-06"; - src = fetchFromGitHub { - owner = "Tencent"; - repo = "rapidjson"; - rev = "5e17dbed34eef33af8f3e734820b5dc547a2a3aa"; - hash = "sha256-CTy42X6P6+Gz4WbJ3tCpAw3qqlJ+mU1PaWW9LGG+6nU="; - }; - 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="; - }) - ]; - }); -in buildPythonPackage rec { - version = "1.18"; + version = "1.20"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; @@ -40,13 +21,13 @@ buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-4gJm6EnT6YNg+EkkBPiPQ4TBGG/u+FZTK4bKWyqw1pM="; + hash = "sha256-xIswmHQMl5pAqvcTNqeuO3P6MynKt3ahzUgGQroaqmw="; }; patches = [ (substituteAll { src = ./rapidjson-include-dir.patch; - rapidjson = lib.getDev rapidjson'; + rapidjson = lib.getDev rapidjson; }) ];