diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-01-10 18:02:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 18:02:37 -0500 |
| commit | 3bcd4f37c6eafba509447ef655676180cc766477 (patch) | |
| tree | cf845fd2cc5b098ad94184cc4e1cacac5c0b9c11 | |
| parent | 8336ccaa44d961e5fc3ee2e385f00a4f7891e46c (diff) | |
| parent | 642f778fb6d77c6814093b83144174170abc547e (diff) | |
| download | nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar.gz nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar.bz2 nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar.lz nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar.xz nixlib-3bcd4f37c6eafba509447ef655676180cc766477.tar.zst nixlib-3bcd4f37c6eafba509447ef655676180cc766477.zip | |
Merge pull request #53726 from Ma27/unbreak-thrift
thrift: fix build
| -rw-r--r-- | pkgs/development/python-modules/pycassa/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/python-modules/thrift/default.nix | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index 3791efc0e2e4..d5b6805c2bb0 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -1,5 +1,18 @@ { 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 { pname = "pycassa"; version = "1.11.2"; @@ -15,7 +28,7 @@ buildPythonPackage rec { # running doCheck = false; - propagatedBuildInputs = [ thrift ]; + propagatedBuildInputs = [ thrift' ]; meta = { description = "A python client library for Apache Cassandra"; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 6897a5bbba85..d5a83832cb27 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -12,6 +13,8 @@ buildPythonPackage rec { sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b"; }; + propagatedBuildInputs = [ six ]; + # No tests. Breaks when not disabling. doCheck = false; |