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: 862ef87ae71e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 54c4d899b5f4
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 19, 2019

  1. pythonPackages.grpcio: inherit src from grpc

    @tomberek @marsam
    tomberek authored and marsam committed Oct 19, 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
    6b09e24 View commit details

Commits on Oct 20, 2019

  1. pythonPackages.grpcio-tools: 1.23.0 -> 1.24.3

    @tomberek @marsam
    tomberek authored and marsam committed Oct 20, 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
    d368f8c View commit details

Commits on Oct 23, 2019

  1. grpc: 1.23.0 -> 1.24.3 

    Co-authored-by: Tom Bereknyei <tomberek@users.noreply.github.com>
    @marsam @tomberek
    marsam and tomberek committed Oct 23, 2019
    Copy the full SHA
    e90d7e7 View commit details

  2. Merge pull request #71371 from tomberek/tomberek/grpcio 

    grpcio: 1.23.0 -> 1.24.3
    @marsam
    marsam authored Oct 23, 2019
    Copy the full SHA
    54c4d89 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,14 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:

stdenv.mkDerivation rec {
version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
version = "1.24.3"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6";
sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.23.0";
version = "1.24.3";

src = fetchPypi {
inherit pname version;
sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db";
sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f";
};

enableParallelBuilding = true;
12 changes: 2 additions & 10 deletions pkgs/development/python-modules/grpcio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
{ stdenv, buildPythonPackage, darwin, grpc
, six, protobuf, enum34, futures, isPy27, pkgconfig
, cython}:

buildPythonPackage rec {
inherit (grpc) src version;
pname = "grpcio";
version = "1.23.0";

src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5";
};

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