thrift: Move from Python 2 to Python 3

The Twisted dependency now requires Python 3.
Also, Python 2 is long-since EOL.

+8 -12
+3 -3
pkgs/development/libraries/thrift/0.10.nix
··· 1 - { lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison 2 - , flex, twisted 3 }: 4 5 stdenv.mkDerivation rec { ··· 19 20 nativeBuildInputs = [ pkg-config ]; 21 buildInputs = [ 22 - boost zlib libevent openssl python bison flex twisted 23 ]; 24 25 preConfigure = "export PY_PREFIX=$out";
··· 1 + { lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison 2 + , flex 3 }: 4 5 stdenv.mkDerivation rec { ··· 19 20 nativeBuildInputs = [ pkg-config ]; 21 buildInputs = [ 22 + boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted])) 23 ]; 24 25 preConfigure = "export PY_PREFIX=$out";
+3 -3
pkgs/development/libraries/thrift/default.nix
··· 1 - { lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config 2 - , bison, flex, twisted 3 , static ? stdenv.hostPlatform.isStatic 4 }: 5 ··· 18 19 nativeBuildInputs = [ cmake pkg-config bison flex ]; 20 buildInputs = [ boost zlib libevent openssl ] 21 - ++ lib.optionals (!static) [ python twisted ]; 22 23 preConfigure = "export PY_PREFIX=$out"; 24
··· 1 + { lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config 2 + , bison, flex 3 , static ? stdenv.hostPlatform.isStatic 4 }: 5 ··· 18 19 nativeBuildInputs = [ cmake pkg-config bison flex ]; 20 buildInputs = [ boost zlib libevent openssl ] 21 + ++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ]; 22 23 preConfigure = "export PY_PREFIX=$out"; 24
+2 -6
pkgs/top-level/all-packages.nix
··· 18916 18917 theft = callPackage ../development/libraries/theft { }; 18918 18919 - thrift = callPackage ../development/libraries/thrift { 18920 - inherit (pythonPackages) twisted; 18921 - }; 18922 18923 - thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { 18924 - inherit (pythonPackages) twisted; 18925 - }; 18926 18927 tidyp = callPackage ../development/libraries/tidyp { }; 18928
··· 18916 18917 theft = callPackage ../development/libraries/theft { }; 18918 18919 + thrift = callPackage ../development/libraries/thrift { }; 18920 18921 + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; 18922 18923 tidyp = callPackage ../development/libraries/tidyp { }; 18924