git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53726 from Ma27/unbreak-thrift

thrift: fix build

commit3bcd4f37c6eafba509447ef655676180cc766477 authorworldofpeace <worldofpeace@users.noreply.github.com> dateThu 10 Jan 2019, 18:02 (8 years ago) parent8336cca642f778
2 files changed+17−1
pkgs/development/python-modules/pycassa/default.nix+14−1 pkgs/development/python-modules/thrift/default.nix+3
pkgs/development/python-modules/pycassa/default.nix+14−1
@@ -1,5 +1,18 @@
11{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
22
3+let
4+
5+ thrift' = thrift.overridePythonAttrs (old: rec {
6+ version = "0.9.3";
7+ src= fetchPypi {
8+ inherit (old) pname;
9+ inherit version;
10+ sha256 = "0zl7cgckqy9j5vq8wyfzw82q1blkdpsblnmhv8c6ffcxs4xkvg6z";
11+ };
12+ });
13+
14+in
15+
316buildPythonPackage rec {
417 pname = "pycassa";
518 version = "1.11.2";
@@ -15,7 +28,7 @@ buildPythonPackage rec {
1528 # running
1629 doCheck = false;
1730
18− propagatedBuildInputs = [ thrift ];
31+ propagatedBuildInputs = [ thrift' ];
1932
2033 meta = {
2134 description = "A python client library for Apache Cassandra";
pkgs/development/python-modules/thrift/default.nix+3
@@ -1,6 +1,7 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4+, six
45}:
56
67buildPythonPackage rec {
@@ -12,6 +13,8 @@ buildPythonPackage rec {
1213 sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b";
1314 };
1415
16+ propagatedBuildInputs = [ six ];
17+
1518 # No tests. Breaks when not disabling.
1619 doCheck = false;
1720