From 53380970e7d074e595f3e9db9dcbbb70f45f79fc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 10 Jan 2019 02:42:21 +0100
Subject: pythonPackages.thrift: fix build

Adds missing `six` dependency to the build inputs.

See also https://hydra.nixos.org/build/86094652
---
 pkgs/development/python-modules/thrift/default.nix | 3 +++
 1 file changed, 3 insertions(+)

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;
 
-- 
cgit 1.4.1


From 642f778fb6d77c6814093b83144174170abc547e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 10 Jan 2019 02:49:17 +0100
Subject: pythonPackages.pycassa: fix build

Use `thrift` 0.9.3 to build.

See also https://github.com/pycassa/pycassa/issues/245
---
 pkgs/development/python-modules/pycassa/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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";
-- 
cgit 1.4.1