cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

grpc: 1.57.0 -> 1.59.1

Browse source
This commit is contained in:
Mario Rodas 2023-10-25 04:20:00 +00:00 committed by Yt
parent 17d1b7e38e
commit 805cac42cb
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/grpc/default.nix
View file

@ -21,7 +21,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "grpc"; pname = "grpc";
version = "1.57.0"; # N.B: if you change this, please update: version = "1.59.1"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools # pythonPackages.grpcio-tools
# pythonPackages.grpcio-status # pythonPackages.grpcio-status
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "grpc"; owner = "grpc";
repo = "grpc"; repo = "grpc";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -37,14 +37,8 @@ stdenv.mkDerivation rec {
(fetchpatch { (fetchpatch {
# armv6l support, https://github.com/grpc/grpc/pull/21341 # armv6l support, https://github.com/grpc/grpc/pull/21341
name = "grpc-link-libatomic.patch"; name = "grpc-link-libatomic.patch";
url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch";
hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8=";
})
# Fix generated CMake config file
# FIXME: remove when merged
(fetchpatch {
url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch";
hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo=";
}) })
]; ];
@ -94,13 +88,12 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
''; '';
env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( env.NIX_CFLAGS_COMPILE = toString ([
lib.optionals stdenv.cc.isClang [ "-Wno-error"
"-Wno-error=unknown-warning-option" ] ++ lib.optionals stdenv.isDarwin [
] ++ lib.optionals stdenv.isAarch64 [ # Workaround for https://github.com/llvm/llvm-project/issues/48757
"-Wno-error=format-security" "-Wno-elaborated-enum-base"
] ]);
);
enableParallelBuilds = true; enableParallelBuilds = true;

4
pkgs/top-level/all-packages.nix
View file

@ -21784,10 +21784,10 @@ with pkgs;
grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; grilo-plugins = callPackage ../development/libraries/grilo-plugins { };
grpc = callPackage ../development/libraries/grpc { grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc {
stdenv = if (stdenv.isDarwin && stdenv.isx86_64) then stdenv = if (stdenv.isDarwin && stdenv.isx86_64) then
# Work around Clang check for 10.13 when using aligned allocations with C++17. # Work around Clang check for 10.13 when using aligned allocations with C++17.
stdenv.override (old: { darwin.apple_sdk_11_0.stdenv.override (old: {
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.13"; }; hostPlatform = old.hostPlatform // { darwinMinVersion = "10.13"; };
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.13"; }; buildPlatform = old.buildPlatform // { darwinMinVersion = "10.13"; };
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.13"; }; targetPlatform = old.targetPlatform // { darwinMinVersion = "10.13"; };