JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12216 from bjornfor/thrift

Browse Source 
thrift: 0.9.2 -> 0.9.3
This commit is contained in:
Pascal Wittmann 2016-01-08 08:30:11 +01:00
commit f438011aed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/thrift/default.nix
View File

@ -1,14 +1,14 @@
{ 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
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
pythonPath = [];
buildInputs = [
boost zlib libevent openssl python pkgconfig bison flex
boost zlib libevent openssl python pkgconfig bison flex twisted
];
preConfigure = "export PY_PREFIX=$out";

4
pkgs/top-level/all-packages.nix
View File

@ -8519,7 +8519,9 @@ let
python = python2;
};
thrift = callPackage ../development/libraries/thrift { };
thrift = callPackage ../development/libraries/thrift {
inherit (pythonPackages) twisted;
};
tidyp = callPackage ../development/libraries/tidyp { };