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

Commits on Nov 27, 2018

  1. grpc: 1.15.0 -> 1.16.1

    @lopsided98 @worldofpeace
    lopsided98 authored and worldofpeace committed Nov 27, 2018

    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
    0d7407c View commit details

  2. pythonPackages.grpcio: 1.15.0 -> 1.16.1

    @lopsided98 @worldofpeace
    lopsided98 authored and worldofpeace committed Nov 27, 2018
    Copy the full SHA
    de39c5f View commit details

  3. pythonPackages.grpcio-tools: 1.14.2 -> 1.16.1

    @lopsided98 @worldofpeace
    lopsided98 authored and worldofpeace committed Nov 27, 2018
    Copy the full SHA
    4380a91 View commit details

  4. pythonPackages.protobuf: fix compatibility with Python 3.7

    @lopsided98 @worldofpeace
    lopsided98 authored and worldofpeace committed Nov 27, 2018
    Copy the full SHA
    be8569b View commit details
6 changes: 3 additions & 3 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.15.0";
version = "1.16.1";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730";
sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv";
rev = "v${version}";
sha256 = "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/grpcio-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.14.2";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "b3fd64a5b8c1d981f6d68a331449109633710a346051c44e0f0cca1812e2b4b0";
sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd";
};

enableParallelBuilding = true;

propagatedBuildInputs = [ grpc grpcio ];
propagatedBuildInputs = [ grpcio ];

# no tests in the package
doCheck = false;
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
with stdenv.lib;
buildPythonPackage rec {
pname = "grpcio";
version = "1.15.0";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "1lhh76kgyibgsk6c54nbzzhkskknkbvn71xvixsk0prfp8izr98m";
sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1";
};

nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;
11 changes: 10 additions & 1 deletion pkgs/development/python-modules/protobuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python, buildPythonPackage
{ stdenv, fetchpatch, python, buildPythonPackage
, protobuf, google_apputils, pyext, libcxx
, disabled, doCheck ? true }:

@@ -16,6 +16,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ protobuf google_apputils ];
buildInputs = [ google_apputils pyext ];

patches = [
# Python 3.7 compatibility (remove when protobuf 3.7 is released)
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
stripLen = 1;
})
];

prePatch = ''
while [ ! -d python ]; do
cd *