From 83a6a7de2835148baaa6aaa94a449c77389887a3 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@pythonspeed.com>
Date: Wed, 3 May 2023 17:20:29 -0400
Subject: [PATCH 1/3] Newer klein and werkzeug.

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 9837b3bab..0453fa63f 100644
--- a/setup.py
+++ b/setup.py
@@ -140,10 +140,10 @@ install_requires = [
     "collections-extended >= 2.0.2",
 
     # HTTP server and client
-    "klein",
+    # Latest version is necessary to work with latest werkzeug:
+    "klein >= 23.5.0",
     # 2.2.0 has a bug: https://github.com/pallets/werkzeug/issues/2465
-    # 2.3.x has an incompatibility with Klein: https://github.com/twisted/klein/pull/575
-    "werkzeug != 2.2.0, < 2.3",
+    "werkzeug != 2.2.0",
     "treq",
     "cbor2",
 

From c70930b47921facf49d5cc371bd575bd715f7669 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@pythonspeed.com>
Date: Wed, 3 May 2023 17:21:07 -0400
Subject: [PATCH 2/3] News fragment.

---
 newsfragments/4024.minor | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 newsfragments/4024.minor

diff --git a/newsfragments/4024.minor b/newsfragments/4024.minor
new file mode 100644
index 000000000..e69de29bb

From f5acaea134b017a3e9a0b0fa537836b268ae06a3 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 11 May 2023 09:05:58 -0400
Subject: [PATCH 3/3] bump the version of klein in the nix-based builds

---
 nix/klein.nix            | 9 +++++++++
 nix/python-overrides.nix | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 nix/klein.nix

diff --git a/nix/klein.nix b/nix/klein.nix
new file mode 100644
index 000000000..be4426465
--- /dev/null
+++ b/nix/klein.nix
@@ -0,0 +1,9 @@
+{ klein, fetchPypi }:
+klein.overrideAttrs (old: rec {
+  pname = "klein";
+  version = "23.5.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-kGkSt6tBDZp/NRICg5w81zoqwHe9AHHIYcMfDu92Aoc=";
+  };
+})
diff --git a/nix/python-overrides.nix b/nix/python-overrides.nix
index 87c42ad58..032b427ae 100644
--- a/nix/python-overrides.nix
+++ b/nix/python-overrides.nix
@@ -21,6 +21,12 @@ in {
   pycddl = self.callPackage ./pycddl.nix { };
   txi2p = self.callPackage ./txi2p.nix { };
 
+  # Update the version of klein.
+  klein = self.callPackage ./klein.nix {
+    # Avoid infinite recursion.
+    inherit (super) klein;
+  };
+
   # collections-extended is currently broken for Python 3.11 in nixpkgs but
   # we know where a working version lives.
   collections-extended = self.callPackage ./collections-extended.nix {