From 120b6b06dfa860ed2d4412396679a1f3559fa76b Mon Sep 17 00:00:00 2001
From: Dima <dgoldin+github@protonmail.ch>
Date: Tue, 22 Oct 2019 21:28:15 +0200
Subject: [PATCH] pythonPackages.apsw: 3.22.0-r1 -> 3.29.0-r1 + sqlite fix

Bumping version of apsw to be able to backport an upstream fix for
SQLite >= 3.30.0 which fixes a failing test.
---
 pkgs/development/python-modules/apsw/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix
index fb22128b928..9169b0d9ec3 100644
--- a/pkgs/development/python-modules/apsw/default.nix
+++ b/pkgs/development/python-modules/apsw/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
 , sqlite, isPyPy }:
 
 buildPythonPackage rec {
   pname = "apsw";
-  version = "3.22.0-r1";
+  version = "3.29.0-r1";
 
   disabled = isPyPy;
 
@@ -11,11 +11,19 @@ buildPythonPackage rec {
     owner = "rogerbinns";
     repo = "apsw";
     rev = version;
-    sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak";
+    sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb";
   };
 
   buildInputs = [ sqlite ];
 
+  patches = [
+    # Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275
+    (fetchpatch {
+      url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff";
+      sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A Python wrapper for the SQLite embedded relational database engine";
     homepage = https://github.com/rogerbinns/apsw;