Merge pull request #12216 from bjornfor/thrift

thrift: 0.9.2 -> 0.9.3

pkgs/development/libraries/thrift/default.nix

···
 { stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison
-, flex
+, flex, twisted
 }:
 
 stdenv.mkDerivation rec {
   name = "thrift-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
-    sha256 = "0w4m6hjmgr1wqac9p5zyfxx2wwqay730qi14fzxba7f46hwhvxff";
+    sha256 = "17lnchan9q3qdg222rgjjai6819j9k755s239phdv6n0183hlx5h";
   };
 
   #enableParallelBuilding = true; problems on hydra
···
   pythonPath = [];
 
   buildInputs = [
-    boost zlib libevent openssl python pkgconfig bison flex
+    boost zlib libevent openssl python pkgconfig bison flex twisted
   ];
 
   preConfigure = "export PY_PREFIX=$out";

pkgs/top-level/all-packages.nix

···
     python = python2;
   };
 
-  thrift = callPackage ../development/libraries/thrift { };
+  thrift = callPackage ../development/libraries/thrift {
+    inherit (pythonPackages) twisted;
+  };
 
   tidyp = callPackage ../development/libraries/tidyp { };