diff --git a/nix/python-overrides.nix b/nix/python-overrides.nix index 3faa4aa99..22bac1ca1 100644 --- a/nix/python-overrides.nix +++ b/nix/python-overrides.nix @@ -51,17 +51,6 @@ in { inherit (super) txtorcon; }; - # With our customized package set a Twisted unit test fails. Patch the - # Twisted test suite to skip that test. - # Filed upstream at https://github.com/twisted/twisted/issues/11877 - twisted = super.twisted.overrideAttrs (old: { - patches = (old.patches or []) ++ [ ./twisted.patch ]; - }); - - # The cryptography that we get from nixpkgs to satisfy the pyopenssl upgrade - # that we did breaks service-identity ... so get a newer version that works. - service-identity = self.callPackage ./service-identity.nix { }; - # 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 { diff --git a/nix/twisted.patch b/nix/twisted.patch deleted file mode 100644 index 1b6846c8e..000000000 --- a/nix/twisted.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/twisted/internet/test/test_endpoints.py b/src/twisted/internet/test/test_endpoints.py -index c650fd8aa6..a1754fd533 100644 ---- a/src/twisted/internet/test/test_endpoints.py -+++ b/src/twisted/internet/test/test_endpoints.py -@@ -4214,6 +4214,7 @@ class WrapClientTLSParserTests(unittest.TestCase): - connectionCreator = connectionCreatorFromEndpoint(reactor, endpoint) - self.assertEqual(connectionCreator._hostname, "\xe9xample.example.com") - -+ @skipIf(True, "self.assertFalse(plainClient.transport.disconnecting) fails") - def test_tls(self): - """ - When passed a string endpoint description beginning with C{tls:},