From eb125a0a339d32d8e4ed6f55688347e28616f1a6 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 29 Aug 2024 14:39:30 -0600
Subject: [PATCH] pkgs/promnesia: update deps and friends

---
 pkgs/cachew.nix                | 18 ++++++++-----
 pkgs/google-takeout-parser.nix | 47 ++++++++++++++++++++++++++++++++++
 pkgs/hpi.nix                   |  8 ++++++
 pkgs/promnesia.nix             | 21 ++++++++-------
 pkgs/sqlcipher3.nix            |  3 ++-
 5 files changed, 81 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/google-takeout-parser.nix

diff --git a/pkgs/cachew.nix b/pkgs/cachew.nix
index b5ac371..7a59f55 100644
--- a/pkgs/cachew.nix
+++ b/pkgs/cachew.nix
@@ -1,22 +1,28 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , setuptools-scm
 , appdirs
 , sqlalchemy
+, orjson
+, pytz
 , ...
 }:
 buildPythonPackage rec {
   pname = "cachew";
-  version = "0.11.0";
+  version = "0.16.20240828";
 
   nativeBuildInputs = [ setuptools-scm ];
 
+  pyproject = true;
+
   doCheck = true;
 
-  propagatedBuildInputs = [ appdirs sqlalchemy ];
+  propagatedBuildInputs = [ appdirs sqlalchemy orjson pytz ];
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-4qjgvffInKRpKST9xbwwC2+m8h3ups0ZePyJLUU+KhA=";
+  src = fetchFromGitHub {
+    owner = "karlicoss";
+    repo = pname;
+    rev = "250f648c4b9f27fb9dfc8961d8f261faddcf5cb0";
+    hash = "sha256-6UZQ6J3XSSFrrxON1/0J/zvOD0Pu5ufU13CBcTs+6vs=";
   };
 }
diff --git a/pkgs/google-takeout-parser.nix b/pkgs/google-takeout-parser.nix
new file mode 100644
index 0000000..e176d04
--- /dev/null
+++ b/pkgs/google-takeout-parser.nix
@@ -0,0 +1,47 @@
+{ pkgs
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools-scm
+, beautifulsoup4
+, click
+, ipython
+, logzero
+, lxml
+, platformdirs
+, pytz
+}:
+let
+  cachew = pkgs.python3Packages.callPackage ./cachew.nix { inherit pkgs; };
+in
+buildPythonPackage rec {
+  pname = "google_takeout_parser";
+  version = "0.0.20240508";
+
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "seanbreckenridge";
+    repo = pname;
+    rev = "9aea89ffeae29246c9c6e27a62dd9fad13b17abc";
+    hash = "sha256-ns3vBnsZVyUi2nnnE3cBZ7vzZQQ44gkfvglkMZGuud0=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  doCheck = true;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    cachew
+    click
+    ipython
+    logzero
+    lxml
+    platformdirs
+    pytz
+  ];
+}
diff --git a/pkgs/hpi.nix b/pkgs/hpi.nix
index f2c5fe8..cdd0170 100644
--- a/pkgs/hpi.nix
+++ b/pkgs/hpi.nix
@@ -9,15 +9,19 @@
 , logzero
 , lxml
 , more-itertools
+, hypothesis
 , mypy
 , orjson
 , pandas
 , pytz
 , simplejson
+, colorlog
 , ...
 }:
 with pkgs; let
   orgparse = pkgs.python3Packages.callPackage ./orgparse.nix { inherit pkgs; };
+  cachew = pkgs.python3Packages.callPackage ./cachew.nix { inherit pkgs; };
+  google_takeout_parser = pkgs.python3Packages.callPackage ./google-takeout-parser.nix { inherit pkgs; };
   kobuddy = pkgs.python3Packages.callPackage ./kobuddy.nix { inherit pkgs; };
   ghexport = pkgs.python3Packages.callPackage ./ghexport.nix { inherit pkgs; };
   kompress = buildPythonPackage rec {
@@ -48,12 +52,16 @@ buildPythonPackage rec {
     click
     decorator
     geopy
+    cachew
+    hypothesis
+    colorlog
     kompress
     kobuddy
     logzero
     lxml
     ghexport
     more-itertools
+    google_takeout_parser
     mypy
     orgparse
     orjson
diff --git a/pkgs/promnesia.nix b/pkgs/promnesia.nix
index 6960ebd..a55fe59 100644
--- a/pkgs/promnesia.nix
+++ b/pkgs/promnesia.nix
@@ -1,27 +1,28 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
 , beautifulsoup4
+, buildPythonPackage
 , fastapi
+, fetchFromGitHub
 , httptools
 , logzero
 , lxml
 , mistletoe
 , more-itertools
 , mypy
-, magic
+, pkgs
+, python-dotenv
+, python-magic
 , pytz
 , setuptools
+, setuptools-scm
+, sqlitebrowser
+, starlette
 , tzlocal
 , urlextract
 , uvicorn
 , uvloop
 , watchfiles
 , websockets
-, setuptools-scm
-, starlette
-, python-dotenv
-, pkgs
 , ...
 }:
 with pkgs; let
@@ -29,7 +30,7 @@ with pkgs; let
   sqlcipher3 =
     pkgs.python3Packages.callPackage ./sqlcipher3.nix { inherit pkgs; };
   cachew = pkgs.python3Packages.callPackage ./cachew.nix { inherit pkgs; };
-  # python-dotenv = pkgs.python3Packages.callPackage ./python-dotenv.nix { };
+  google_takeout_parser = pkgs.python3Packages.callPackage ./google-takeout-parser.nix { inherit pkgs; };
 in
 buildPythonPackage rec {
   pname = "promnesia";
@@ -59,7 +60,8 @@ buildPythonPackage rec {
     cachew
     fastapi
     hpi
-    magic
+    google_takeout_parser
+    python-magic
     httptools
     starlette
     logzero
@@ -77,6 +79,7 @@ buildPythonPackage rec {
     uvloop
     watchfiles
     websockets
+    sqlitebrowser
   ];
 
   makeWrapperArgs = [
diff --git a/pkgs/sqlcipher3.nix b/pkgs/sqlcipher3.nix
index fa9f55c..5e73598 100644
--- a/pkgs/sqlcipher3.nix
+++ b/pkgs/sqlcipher3.nix
@@ -2,6 +2,7 @@
 , setuptools-scm
 , sqlcipher
 , fetchFromGitHub
+, sqlite
 , ...
 }:
 buildPythonPackage rec {
@@ -9,7 +10,7 @@ buildPythonPackage rec {
   version = "0.5.3";
 
   nativeBuildInputs = [ setuptools-scm ];
-  propagatedBuildInputs = [ sqlcipher ];
+  propagatedBuildInputs = [ sqlcipher sqlite ];
 
   doCheck = true;