From e628862e97acc5cd9aa2c9da86f26edd6d14605c Mon Sep 17 00:00:00 2001 From: sterni Date: Fri, 19 Feb 2021 12:42:24 +0100 Subject: chore(3p): Bump NixOS channels to 2021-02-18 Main motivation for this is to get the openldap update that fixes 10 CVEs: CVE-2020-36221 to including CVE-2020-36230. See also this issue which lists them all: https://github.com/NixOS/nixpkgs/issues/113490 Someone should also redeploy whitby as soon as this lands in canon and all build failures have been fixed. Things done to resolve upstream breakages: * grpc no longer takes abseil-cpp as an input, it has also been removed in the override. * Upgrade glittershark's kernel to 5.11 since the linuxPackages_5_9 attribute has been removed by upstream and the patch used by them is available for 5.11 as well. * The fixed output hash for third_patry.apereo-cas changed for some reason. * Remove the pin of haskellPackages.vector from the haskell overlay. It broke as the most recent version of vector in nixos-unstable no longer depends on semigroups. This effectively updates vector from 0.12.1.2 to 0.12.2.0. * Align two comments in tvix/libstore/worker-protocol.hh because the updated clang-format now demands that. Change-Id: I2ecf10a98de935e9222acf1feaea447d4c11ed2d Reviewed-on: https://cl.tvl.fyi/c/depot/+/2538 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: glittershark Reviewed-by: sterni --- third_party/grpc/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'third_party/grpc') diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix index a3745a2099ae..ad34425e8f05 100644 --- a/third_party/grpc/default.nix +++ b/third_party/grpc/default.nix @@ -1,7 +1,6 @@ { pkgs, ... }: (pkgs.originals.grpc.override { - abseil-cpp = pkgs.abseil_cpp; protobuf = pkgs.protobuf; stdenv = pkgs.llvmPackages.libcxxStdenv; }).overrideAttrs(orig: rec { -- cgit 1.4.1