b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

thrift: Move from Python 2 to Python 3

Browse source 
The Twisted dependency now requires Python 3.
Also, Python 2 is long-since EOL.
This commit is contained in:
Jean-Paul Calderone 2021-08-16 08:25:46 -04:00
parent b4692e4197
commit 4ce1122a3e
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/thrift/0.10.nix
View file

@ -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";

6
pkgs/development/libraries/thrift/default.nix
View file

@ -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";

8
pkgs/top-level/all-packages.nix
View file

@ -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 { };