From 7deabb8c8d6f4c7e58e2b16548b8a1895795963b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 7 Apr 2021 14:34:13 +0200 Subject: chore(3p): Bump channels to 2021-04-09 Fixes included: * exposed gtest in the package set, required for protobuf * pinned SBCL to version 2.0.8: The channel moved it to >2.1, and a bunch of warnings seemed to be killing our builds - we should investigate this later. * removed kernel patches from //users/tazjin/frog: this machine is currently out of service anyways, not worth fixing while it's offline * removed steam & lutris from frog (they're currently broken) * removed Haskell overrides for hedgehog-classes & hgeometry-combinatorial * use gRPC sources from upstream and inject Abseil via Nix instead * fix for renamed grpc import in //third_party/nix * use libfprint-tod from upstream nixpkgs in glittershark/yeren and delete glittershark/pkgs/fprintd entirely, since all of the patches used there are available and working from upstream now (and stopped working here after the bump) Change-Id: Ia90e6f774f7b88bc9e60d28351b900ca43ee2695 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2901 Reviewed-by: glittershark Reviewed-by: tazjin Reviewed-by: sterni Reviewed-by: lukegb Tested-by: BuildkiteCI --- third_party/grpc/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'third_party/grpc') diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix index 87ae5d7a32d7..f8fd1ac89639 100644 --- a/third_party/grpc/default.nix +++ b/third_party/grpc/default.nix @@ -3,17 +3,8 @@ (pkgs.grpc.override { protobuf = depot.third_party.protobuf; stdenv = pkgs.llvmPackages.libcxxStdenv; + abseil-cpp = depot.third_party.abseil_cpp; }).overrideAttrs(orig: rec { - version = "1.30.0"; - - src = pkgs.fetchFromGitHub { - owner = "grpc"; - repo = "grpc"; - rev = "v${version}"; - sha256 = "01w5jdp318i7ncxbkfv75q0mf0rd3qwfr1ycdd3850nv6mprv7n0"; - fetchSubmodules = true; - }; - cmakeFlags = orig.cmakeFlags ++ [ "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_CXX_STANDARD_REQUIRED=ON" -- cgit 1.4.1