From 4ce1122a3e8867bd26e583a25b2e2f996703a63b Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 16 Aug 2021 08:25:46 -0400
Subject: [PATCH] thrift: Move from Python 2 to Python 3

The Twisted dependency now requires Python 3.
Also, Python 2 is long-since EOL.
---
 pkgs/development/libraries/thrift/0.10.nix    | 6 +++---
 pkgs/development/libraries/thrift/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 8 ++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/thrift/0.10.nix b/pkgs/development/libraries/thrift/0.10.nix
index d81912b07c61..001de25e9963 100644
--- a/pkgs/development/libraries/thrift/0.10.nix
+++ b/pkgs/development/libraries/thrift/0.10.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison
-, flex, twisted
+{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
+, flex
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    boost zlib libevent openssl python bison flex twisted
+    boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
   ];
 
   preConfigure = "export PY_PREFIX=$out";
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index a34fc36484d9..6460be99fd47 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config
-, bison, flex, twisted
+{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config
+, bison, flex
 , static ? stdenv.hostPlatform.isStatic
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkg-config bison flex ];
   buildInputs = [ boost zlib libevent openssl ]
-    ++ lib.optionals (!static) [ python twisted ];
+    ++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ];
 
   preConfigure = "export PY_PREFIX=$out";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a32c15dcd42..e9e7ad540721 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18916,13 +18916,9 @@ with pkgs;
 
   theft = callPackage ../development/libraries/theft { };
 
-  thrift = callPackage ../development/libraries/thrift {
-    inherit (pythonPackages) twisted;
-  };
+  thrift = callPackage ../development/libraries/thrift { };
 
-  thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix {
-    inherit (pythonPackages) twisted;
-  };
+  thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };
 
   tidyp = callPackage ../development/libraries/tidyp { };