From ab5a40ef7fc6a2328fb232c2cfd08bb4d286ee23 Mon Sep 17 00:00:00 2001
From: Jan van Esdonk <jan+dev@vanesdonk.de>
Date: Sun, 21 Jul 2024 17:43:33 +0200
Subject: [PATCH 1/3] python312Packages.pypdf: 4.2.0 -> 4.3.1

https://github.com/py-pdf/pypdf/releases/tag/4.3.0
https://github.com/py-pdf/pypdf/releases/tag/4.3.1

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 pkgs/development/python-modules/pypdf/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix
index 3ecbde22d690..23c90f841ac5 100644
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@@ -27,8 +27,8 @@
 
 buildPythonPackage rec {
   pname = "pypdf";
-  version = "4.2.0";
-  format = "pyproject";
+  version = "4.3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-pdf";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     rev = "refs/tags/${version}";
     # fetch sample files used in tests
     fetchSubmodules = true;
-    hash = "sha256-ksLpxfRxrNVXezF0VjbAqadpF6bv/SAOOnCKabhugo0=";
+    hash = "sha256-wSF20I5WaxRoN0n0jxB5O3mAAIOxP/TclYBTRAUwYHo=";
   };
 
   outputs = [
@@ -55,12 +55,12 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace "--disable-socket" ""
+      --replace-fail "--disable-socket" ""
   '';
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ];
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ];
 
-  passthru.optional-dependencies = rec {
+  optional-dependencies = rec {
     full = crypto ++ image;
     crypto = [ cryptography ];
     image = [ pillow ];
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     (fpdf2.overridePythonAttrs { doCheck = false; }) # avoid reference loop
     pytestCheckHook
     pytest-timeout
-  ] ++ passthru.optional-dependencies.full;
+  ] ++ optional-dependencies.full;
 
   pytestFlagsArray = [
     # don't access the network

From 0dc6b40136fbbb310fa130780fd7f97b7612340c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 15:39:02 +0200
Subject: [PATCH 2/3] python312Packages.comicon: 1.1.0 -> 1.2.0

---
 pkgs/development/python-modules/comicon/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/comicon/default.nix b/pkgs/development/python-modules/comicon/default.nix
index d42304712ef3..da91b3947731 100644
--- a/pkgs/development/python-modules/comicon/default.nix
+++ b/pkgs/development/python-modules/comicon/default.nix
@@ -13,15 +13,15 @@
 
 buildPythonPackage rec {
   pname = "comicon";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "potatoeggy";
     repo = "comicon";
-    rev = "v${version}";
-    hash = "sha256-VP4n2pWXHge2gJ67O2nErJ30gI0vaAMn0VOpX8sLkfs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oiEzZRgyG/RQCo2zSTqwlOhkwz76lSImR0ZtSlIUp4Y=";
   };
 
   nativeBuildInputs = [
@@ -38,6 +38,8 @@ buildPythonPackage rec {
     python-slugify
   ];
 
+  doCheck = false; # test artifacts are not public
+
   pythonImportsCheck = [ "comicon" ];
 
   meta = with lib; {

From 142ac6a97b6ab4d39e8afe5c56112e97b4056567 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 23 Jul 2024 16:48:20 +0200
Subject: [PATCH 3/3] pretix: relax pypdf constraint

---
 pkgs/by-name/pr/pretix/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index fa30d5c1a17d..1a8731768616 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail "markdown==3.6" markdown \
       --replace-fail "protobuf==5.27.*" protobuf \
       --replace-fail "pycryptodome==3.20.*" pycryptodome \
+      --replace-fail "pypdf==4.2.*" pypdf \
       --replace-fail "python-dateutil==2.9.*" python-dateutil \
       --replace-fail "requests==2.31.*" "requests" \
       --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \