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: 2f5a68c83ac8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35484898dadd
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 16, 2019

  1. grpc: 1.18.0 -> 1.19.0 (#56693) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grpc/versions

(cherry picked from commit 64bf8ff)
    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    ab7dfd7 View commit details

  2. grpc: 1.19.0 -> 1.19.1 

    (cherry picked from commit 38b0717)
    @FRidh @bjornfor
    FRidh authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    41c31b9 View commit details

  3. grpc: build shared libs, fixes #58375 

    (cherry picked from commit 93d61e5)
    @FRidh @bjornfor
    FRidh authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    3548489 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/development/libraries/grpc/default.nix
9 changes: 7 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.18.0";
version = "1.19.1";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m";
sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
];

# CMake creates a build directory by default, this conflicts with the
@@ -26,6 +27,10 @@ stdenv.mkDerivation rec {
rm -vf BUILD
'';

preBuild = ''
export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH
'';

NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";

enableParallelBuilds = true;