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

Merge pull request #53726 from Ma27/unbreak-thrift

Browse Source 
thrift: fix build
This commit is contained in:
worldofpeace 2019-01-10 18:02:37 -05:00 committed by GitHub
commit 3bcd4f37c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/python-modules/pycassa/default.nix
View File

@ -1,5 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }: { stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
let
thrift' = thrift.overridePythonAttrs (old: rec {
version = "0.9.3";
src= fetchPypi {
inherit (old) pname;
inherit version;
sha256 = "0zl7cgckqy9j5vq8wyfzw82q1blkdpsblnmhv8c6ffcxs4xkvg6z";
};
});
in
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycassa"; pname = "pycassa";
version = "1.11.2"; version = "1.11.2";
@ -15,7 +28,7 @@ buildPythonPackage rec {
# running # running
doCheck = false; doCheck = false;
propagatedBuildInputs = [ thrift ]; propagatedBuildInputs = [ thrift' ];
meta = { meta = {
description = "A python client library for Apache Cassandra"; description = "A python client library for Apache Cassandra";

3
pkgs/development/python-modules/thrift/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -12,6 +13,8 @@ buildPythonPackage rec {
sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b"; sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b";
}; };
propagatedBuildInputs = [ six ];
# No tests. Breaks when not disabling. # No tests. Breaks when not disabling.
doCheck = false; doCheck = false;