From e3e89c8fe93ee0bf8878fbd55dd1245b68cd6e85 Mon Sep 17 00:00:00 2001 From: Denys Pavlov Date: Thu, 19 Nov 2020 03:00:12 -0500 Subject: [PATCH] pythonPackages.sqlite-utils: depend on sqlite-fts4 Fixed b8c648802ce86535813787456a1ff321e767ca92 where `sqlite-utils` was updated without adding the new `sqlite-fts4` dependency. Disabled two tests that are failing for sqlite v3.34.0, until they are fixed upstream. --- .../python-modules/sqlite-utils/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 6e17fc4f38e..ef595ae93fa 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , click , click-default-group +, sqlite-fts4 , tabulate , pytestCheckHook , pytestrunner , black +, hypothesis +, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; version = "3.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; @@ -23,6 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click click-default-group + sqlite-fts4 tabulate ]; @@ -30,13 +34,19 @@ buildPythonPackage rec { pytestCheckHook pytestrunner black + hypothesis + ]; + + # disabled until upstream updates tests + disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [ + "test_optimize" ]; meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; license = licenses.asl20; - maintainers = [ maintainers.meatcar ]; + maintainers = with maintainers; [ meatcar ]; }; }