Merge pull request #42887 from matthewbauer/libsecurity-closure-reductions

Libsecurity closure reductions

pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix

@@ -1,26 +1,35 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , pythonOlder
 }:
 
 if !(pythonOlder "3.3") then null else buildPythonPackage rec {
   pname = "backports.shutil_get_terminal_size";
-  version = "1.0.0";
+  version = "unstable-2016-02-21";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
+  # there have been numerous fixes commited since the initial release.
+  # Most notably fixing a problem where the backport would always return
+  # terminal size 0. See https://trac.sagemath.org/ticket/25320#comment:5.
+  # Unfortunately the maintainer seems inactive and has not responded to
+  # a request for a new release since 2016:
+  # https://github.com/chrippa/backports.shutil_get_terminal_size/issues/7
+  src = fetchFromGitHub {
+    owner = "chrippa";
+    repo = "backports.shutil_get_terminal_size";
+    rev = "159e269450dbf37c3a837f6ea7e628d59acbb96a";
+    sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg";
   };
 
   checkInputs = [
     pytest
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
     homepage = https://github.com/chrippa/backports.shutil_get_terminal_size;
-    license = with lib.licenses; [ mit ];
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ timokau ];
   };
-}
+}

pkgs/development/python-modules/google_cloud_speech/default.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }:
+, google_api_core, pytest, mock }:
 
 buildPythonPackage rec {
   pname = "google-cloud-speech";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "8396646aa9de210bacb144fabd82ab5fe577b3b11708725c879b72c96009d631";
   };
 
-  propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];
+  propagatedBuildInputs = [ google_api_core ];
   checkInputs = [ pytest mock ];
 
   # needs credentials

pkgs/development/python-modules/google_gax/default.nix

@@ -1,31 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, google_auth, ply, protobuf, grpcio, requests
-, googleapis_common_protos, dill, future, pytest, mock, unittest2 }:
-
-buildPythonPackage rec {
-  pname = "google-gax";
-  version = "0.16.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929";
-  };
-
-  propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ];
-  checkInputs = [ pytest mock unittest2 ];
-
-  # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where
-  # that file would be is unclear to me so I just remove the test.
-  postPatch = ''rm tests/test__grpc_google_auth.py'';
-
-  checkPhase = ''
-    py.test
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Google API Extensions for Python (gax-python) tools based on gRPC and Google API conventions.";
-    homepage = "http://gax-python.readthedocs.io/en/latest/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ vanschelven ];
-  };
-}

pkgs/development/python-modules/grpcio/default.nix

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.12.1";
+  version = "1.13.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f14faadfd09aa8526536cd2149e274563f45b767fca1736ccc53803a6af3f90e";
+    sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426";
   };
 
   propagatedBuildInputs = [ six protobuf ]