From a331662930f45f9ca4684dee6748696c57a68601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Feb 2017 11:03:27 +0100
Subject: [PATCH] pythonPackages.protobuf: add pyext dependency

---
 pkgs/development/python-modules/protobuf.nix | 4 ++--
 pkgs/top-level/python-packages.nix           | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
index 8b9d1ddb03c..f2f0f5025d1 100644
--- a/pkgs/development/python-modules/protobuf.nix
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -1,5 +1,5 @@
 { stdenv, python, buildPythonPackage
-, protobuf, google_apputils
+, protobuf, google_apputils, pyext
 , disabled, doCheck ? true }:
 
 with stdenv.lib;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   inherit disabled doCheck;
 
   propagatedBuildInputs = [ protobuf google_apputils ];
-  buildInputs = [ google_apputils ];
+  buildInputs = [ google_apputils pyext ];
 
   prePatch = ''
     while [ ! -d python ]; do
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acb9cd141e9..dbec6e2dc79 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19316,12 +19316,11 @@ in {
 
   protobuf = self.protobuf2_6;
   # only required by tensorflow
-  protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix {
-    disabled = isPyPy || isPy3k;
-    doCheck = isPy3k;
-    protobuf = pkgs.protobuf3_0_0b2;
+  protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_2;
   };
-
   protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
     disabled = isPyPy;
     doCheck = isPy3k;