From a4c0cba5b29c86a5dc8050861a583a7681bc3241 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Jun 2024 22:00:46 +0000
Subject: [PATCH 1/3] python311Packages.publicsuffixlist: 0.10.1.20240618 ->
 1.0.1.20240629

https://github.com/ko-zu/psl/blob/v1.0.1.20240629-gha/CHANGES.md
---
 .../python-modules/publicsuffixlist/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 9d594dbede78..11d5d38fd10a 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,19 +11,19 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "0.10.1.20240618";
+  version = "1.0.1.20240629";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+wJoH/vCwNPmQlQfikDmnqbNQlMLA315N+U4Yvy/mMw=";
+    hash = "sha256-WXyE+4SHMDoaG+g+GrDcfgYlQTdOv8IQkrmaxBWNjek=";
   };
 
   build-system = [ setuptools ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     update = [ requests ];
     readme = [ pandoc ];
   };
@@ -35,6 +35,7 @@ buildPythonPackage rec {
   pytestFlagsArray = [ "publicsuffixlist/test.py" ];
 
   meta = with lib; {
+    changelog = "https://github.com/ko-zu/psl/blob/v${version}-gha/CHANGES.md";
     description = "Public Suffix List parser implementation";
     homepage = "https://github.com/ko-zu/psl";
     license = licenses.mpl20;

From 568462eaef0606f603a0f559a661102e00751eea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 6 Jul 2024 14:57:15 +0200
Subject: [PATCH 2/3] python312Packages.cssutils: add missing dependency

---
 pkgs/development/python-modules/cssutils/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index a442c2c22e14..7e4447546446 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   pythonOlder,
   fetchFromGitHub,
   setuptools-scm,
+  more-itertools,
   cssselect,
   jaraco-test,
   lxml,
@@ -29,6 +29,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
+  dependencies = [ more-itertools ];
+
   nativeCheckInputs = [
     cssselect
     jaraco-test

From b737fcb8c43b055190234c1eadcc001fe88e69dc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 6 Jul 2024 14:59:42 +0200
Subject: [PATCH 3/3] pretalx: pin to python3.11, relax publicsuffixlist

The dependency chain of pretalx uses fastdiff, which depends on wasmer,
neither of which is ready for Python 3.12.
---
 pkgs/by-name/pr/pretalx/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index 4f4a259f02e7..bbfd52c1ad24 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -1,7 +1,7 @@
 { lib
 , buildNpmPackage
 , gettext
-, python3
+, python311
 , fetchFromGitHub
 , fetchpatch2
 , plugins ? [ ]
@@ -9,7 +9,7 @@
 }:
 
 let
-  python = python3.override {
+  python = python311.override {
     packageOverrides = final: prev: {
       django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
         version = "3.0.0";
@@ -105,6 +105,7 @@ python.pkgs.buildPythonApplication rec {
     "djangorestframework"
     "markdown"
     "pillow"
+    "publicsuffixlist"
     "python-dateutil"
     "reportlab"
     "requests"