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: 769de8c47551
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b122174aa70
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 2, 2019

  1. grpc: 1.19.1 -> 1.22.0

    @marsam
    marsam committed Aug 2, 2019
    Copy the full SHA
    18c2645 View commit details

  2. grpc: fix darwin build

    @marsam
    marsam committed Aug 2, 2019
    Copy the full SHA
    f2c7593 View commit details

Commits on Aug 3, 2019

  1. pythonPackages.grpcio: 1.18.0 -> 1.22.0

    @marsam
    marsam committed Aug 3, 2019
    Copy the full SHA
    5cae05e View commit details

  2. pythonPackages.grpcio-tools: 1.18.0 -> 1.22.0

    @marsam
    marsam committed Aug 3, 2019
    Copy the full SHA
    368d8bb View commit details

Commits on Aug 4, 2019

  1. Merge pull request #65770 from marsam/update-grpc 

    grpc: 1.19.1 -> 1.22.0
    @marsam
    marsam authored Aug 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b12217 View commit details
5 changes: 3 additions & 2 deletions pkgs/development/libraries/grpc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:

stdenv.mkDerivation rec {
version = "1.19.1";
version = "1.22.0";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj";
sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];

# CMake creates a build directory by default, this conflicts with the
10 changes: 5 additions & 5 deletions pkgs/development/python-modules/grpcio-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}:
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }:

buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.18.0";
version = "1.22.0";

src = fetchPypi {
inherit pname version;
sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa";
sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab";
};

enableParallelBuilding = true;

propagatedBuildInputs = [ grpcio ];
propagatedBuildInputs = [ protobuf grpcio ];

# no tests in the package
doCheck = false;

meta = with stdenv.lib; {
description = "Protobuf code generator for gRPC";
license = lib.licenses.asl20;
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
maintainers = with maintainers; [ vanschelven ];
};
18 changes: 8 additions & 10 deletions pkgs/development/python-modules/grpcio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin
, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig
{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
, six, protobuf, enum34, futures, isPy27, pkgconfig
, cython}:

with stdenv.lib;
buildPythonPackage rec {
pname = "grpcio";
version = "1.18.0";
version = "1.22.0";

src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m";
sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz";
};

nativeBuildInputs = [ cython pkgconfig ]
++ optional stdenv.isDarwin darwin.cctools;
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;

propagatedBuildInputs = [ six protobuf ]
++ lib.optionals (isPy27 || isPy34) [ enum34 ]
++ lib.optionals (isPy27) [ futures ];
++ stdenv.lib.optionals (isPy27) [ enum34 futures ];

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

meta = with stdenv.lib; {
description = "HTTP/2-based RPC framework";
license = lib.licenses.asl20;
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
maintainers = with maintainers; [ vanschelven ];
};