diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-10-25 04:20:00 +0000 |
---|---|---|
committer | Yt <happysalada@tuta.io> | 2023-10-28 13:26:06 +0000 |
commit | 805cac42cb8bf1fbe04aeb4c6831ef64a3e53286 (patch) | |
tree | 1a020fbc5bd3474eaea8d499a97425683a3bff1f | |
parent | 17d1b7e38e7d8daacc95d83f8040f8e57d8a22e2 (diff) | |
download | nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar.gz nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar.bz2 nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar.lz nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar.xz nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.tar.zst nixpkgs-805cac42cb8bf1fbe04aeb4c6831ef64a3e53286.zip |
grpc: 1.57.0 -> 1.59.1
-rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 19 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 0532907ac15..5569f99adbe 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; fetchSubmodules = true; }; @@ -37,14 +37,8 @@ stdenv.mkDerivation rec { (fetchpatch { # armv6l support, https://github.com/grpc/grpc/pull/21341 name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; - hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; - }) - # 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="; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) ]; @@ -94,13 +88,12 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=unknown-warning-option" - ] ++ lib.optionals stdenv.isAarch64 [ - "-Wno-error=format-security" - ] - ); + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals stdenv.isDarwin [ + # Workaround for https://github.com/llvm/llvm-project/issues/48757 + "-Wno-elaborated-enum-base" + ]); enableParallelBuilds = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90ff46b518f..b6431e42076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21784,10 +21784,10 @@ with pkgs; 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 # 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"; }; buildPlatform = old.buildPlatform // { darwinMinVersion = "10.13"; }; targetPlatform = old.targetPlatform // { darwinMinVersion = "10.13"; }; |