From 06c6dae0756f1023bbb225c1d70dc5e92dc31808 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 24 Nov 2024 23:44:30 +0100
Subject: pkgs/bookwyrm: 0.7.2 → 0.7.4

passes the basic smoke test, nothing else done (doing this to distract
myself & since people expressed interest in maybe trying to run an
instance again).
---
 pkgs/bookwyrm.nix                |  8 ++++++--
 pkgs/overlay.nix                 |  6 +++---
 pkgs/python/django-pgtrigger.nix | 25 +++++++++++++++++++++++++
 pkgs/python/s3-tar.nix           | 21 +++++++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/python/django-pgtrigger.nix
 create mode 100644 pkgs/python/s3-tar.nix

diff --git a/pkgs/bookwyrm.nix b/pkgs/bookwyrm.nix
index 7a5daec..a72176c 100644
--- a/pkgs/bookwyrm.nix
+++ b/pkgs/bookwyrm.nix
@@ -39,7 +39,7 @@ let
 
   bookwyrm = python.pkgs.buildPythonApplication rec {
     pname = "bookwyrm";
-    version = "0.7.2";
+    version = "0.7.4";
 
     format = "other";
 
@@ -47,7 +47,7 @@ let
       owner = "bookwyrm-social";
       repo = "bookwyrm";
       rev = "refs/tags/v${version}";
-      hash = "sha256-5QhIHpNUn65qTh7ARlnGfUESoxw8hqFaoS2D2z+OSlM=";
+      hash = "sha256-fhFgAsq859fbCvCw+QAioI5lW1c2k6rEiCxwFBGe7vE=";
     };
 
     propagatedBuildInputs = with python.pkgs; [
@@ -63,6 +63,10 @@ let
       django-model-utils
       django-sass-processor
       django-csp
+      django-oauth-toolkit
+      django-storages
+      django-pgtrigger
+      s3-tar
       environs
       flower
       gunicorn
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 679fef8..3f6c6a7 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -263,12 +263,12 @@ in
   #### packaged mostly as shitpost / to play around with ####
 
   bookwyrm = (self.callPackage ./bookwyrm.nix {
-    python = super.python311.override ({
+    python = super.python312.override ({
       packageOverrides = self: super: {
-        django = super.django_3;
-        python-crontab = super.python-crontab.overridePythonAttrs (_: { doCheck = false; });
         django-sass-processor = self.callPackage ./python/django-sass-processor.nix {};
         django-imagekit = self.callPackage ./python/django-imagekit.nix {};
+        django-pgtrigger = self.callPackage ./python/django-pgtrigger.nix {};
+        s3-tar = self.callPackage ./python/s3-tar.nix {};
         bw-file-resubmit = self.callPackage ./python/bw-file-resubmit.nix {};
       };
     });
diff --git a/pkgs/python/django-pgtrigger.nix b/pkgs/python/django-pgtrigger.nix
new file mode 100644
index 0000000..be266b4
--- /dev/null
+++ b/pkgs/python/django-pgtrigger.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, django
+, python
+, poetry-core
+, s3-tar
+}:
+
+buildPythonPackage rec {
+  pname = "django_pgtrigger";
+  version = "4.13.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-9NkG3zpt3hq8QriLNRvZQsGA/ijftmT/TnZuvivY/YE=";
+  };
+
+  nativeCheckInputs = [
+    django
+    poetry-core
+    s3-tar
+  ];
+}
diff --git a/pkgs/python/s3-tar.nix b/pkgs/python/s3-tar.nix
new file mode 100644
index 0000000..8778bc7
--- /dev/null
+++ b/pkgs/python/s3-tar.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+, boto3
+}:
+
+buildPythonPackage rec {
+  pname = "s3-tar";
+  version = "0.1.13";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-0LPuK/NYp+mVFUlrlAdrbrsT8kM6WhVfg5Jb1LW9wgU=";
+  };
+
+  propagatedBuildInputs = [
+    boto3
+  ];
+}
-- 
cgit v1.2.3