Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f18719c1dc0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 365ca1112115
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 27, 2020

  1. python.pkgs.grpcio: use system openssl, zlib, and c-ares 

    (cherry picked from commit 849f26d)
    @matthewbauer @bhipple
    matthewbauer authored and bhipple committed Apr 27, 2020
    Copy the full SHA
    b6ec576 View commit details

Commits on Apr 28, 2020

  1. Merge pull request #86154 from bhipple/bp/grpcio 

    [20.03] python.pkgs.grpcio: use system openssl, zlib, and c-ares
    @matthewbauer
    matthewbauer authored Apr 28, 2020
    Copy the full SHA
    365ca11 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/python-modules/grpcio/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/grpcio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, darwin, grpc
, six, protobuf, enum34, futures, isPy27, pkgconfig
, cython}:
, cython, c-ares, openssl, zlib }:

buildPythonPackage rec {
inherit (grpc) src version;
@@ -9,11 +9,16 @@ buildPythonPackage rec {
nativeBuildInputs = [ cython pkgconfig ]
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;

buildInputs = [ c-ares openssl zlib ];
propagatedBuildInputs = [ six protobuf ]
++ stdenv.lib.optionals (isPy27) [ enum34 futures ];

preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";

GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;

meta = with stdenv.lib; {
description = "HTTP/2-based RPC framework";
license = licenses.asl20;