From 3dcdef6e778ff8042fff3bc7455854a9602711e3 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 8 May 2020 12:23:41 -0400
Subject: [PATCH] Refresh the patch

---
 nix/setup.cfg.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nix/setup.cfg.patch b/nix/setup.cfg.patch
index cc909bc..c2cdeea 100644
--- a/nix/setup.cfg.patch
+++ b/nix/setup.cfg.patch
@@ -1,11 +1,11 @@
 diff --git a/setup.cfg b/setup.cfg
-index 3856a101..371a19b3 100644
+index dfc49607..822ea8dd 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -38,7 +38,7 @@ install_requires =
-     python-challenge-bypass-ristretto
-     # Inherit our Twisted dependency from tahoe-lafs so we don't accidentally
-     # get the extras wrong here and break stuff.
+@@ -40,7 +40,7 @@ install_requires =
+     # incompatible with Tahoe-LAFS'.  So duplicate them here (the ones that
+     # have been observed to cause problems).
+     Twisted[tls,conch]>=18.4.0
 -    tahoe-lafs==1.14.0
 +    tahoe-lafs
      treq
-- 
GitLab