summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajs124 <ajs124@users.noreply.github.com>2022-03-30 15:57:26 +0200
committerGitHub <noreply@github.com>2022-03-30 15:57:26 +0200
commitefea022d6fe0da84aa6613d4ddeafb80de713457 (patch)
tree5cfad9026f952a197468bb1df9f833e86c9638d3
parentd9f92c09ce4094709933f13c5b54dd31c42bae7a (diff)
parent0a3f21a0414afba61fd633889297ebde27ab86ea (diff)
Merge pull request #166354 from mweinelt/21.11/twisted
[21.11] python3Packages.twisted: fix CVE-2022-21712
-rw-r--r--pkgs/development/python-modules/twisted/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index b09ccebde198..ffd7cb92f21b 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, buildPythonPackage
, fetchPypi
+, fetchpatch
, python
, zope_interface
, incremental
@@ -25,6 +26,15 @@ buildPythonPackage rec {
sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic";
};
+ patches = [
+ (fetchpatch {
+ # https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx
+ name = "CVE-2022-21712.patch";
+ url = "https://github.com/twisted/twisted/commit/af8fe78542a6f2bf2235ccee8158d9c88d31e8e2.patch";
+ sha256 = "sha256-4destHY7smyXEvk4Z022wItHvTmaTFibrp9ztd4ZaX4=";
+ })
+ ];
+
propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ];
passthru.extras.tls = [ pyopenssl service-identity idna ];