From 656ff1a3507b8906ff23dd3437b4151db8c935a3 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 9 Sep 2022 17:26:27 +0200 Subject: [PATCH] python3Packages.apsw: 3.38.5-r1 -> 3.39.2.1 fix failing test with upstream patch Signed-off-by: Florian Brandes --- pkgs/development/python-modules/apsw/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index e4b4a94bf832..8e8cab580ea8 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -5,11 +5,12 @@ , sqlite , isPyPy , python +, fetchpatch }: buildPythonPackage rec { pname = "apsw"; - version = "3.38.5-r1"; + version = "3.39.2.1"; format = "setuptools"; disabled = isPyPy; @@ -18,13 +19,22 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pPviSrONGgWZUREMENPt34bpHggR00Kl6DrB40JWm+w="; + hash = "sha256-W1uQFya/IQUBAPAjwdCJ1K5LVc4spcYj0dN2YP2vtN0="; }; buildInputs = [ sqlite ]; + patches = [ + # ongoing issue: https://github.com/rogerbinns/apsw/issues/363 + # apsw needs to know the compile flags of sqlite to match features + (fetchpatch { + url = "https://github.com/rogerbinns/apsw/commit/e92f019ff785d8e52d381dc541d3f4f8236fb356.patch"; + hash = "sha256-Zdy0ukfWkak9lTdU5WMNzWNp7uDROJgXLcfvQdfm2Oo="; + }) + ]; + # Project uses custom test setup to exclude some tests by default, so using pytest # requires more maintenance # https://github.com/rogerbinns/apsw/issues/335