diff options
author | Vincent Ambo <mail@tazj.in> | 2022-02-07T23·13+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2022-02-08T17·21+0000 |
commit | 64b89b528794b3bd29e54a465696e3a7255f9c40 (patch) | |
tree | dd167b0c33d64640647c296352a2e92f3791ffe9 /third_party | |
parent | aa96c3bd833283af1a9bdb7e5a6787a4e9201b57 (diff) |
chore(3p): remove abseil_cpp, grpc, protobuf, re2 r/3795
We're now using the upstream versions of all of these with minor overrides, no separate nonsense required. Change-Id: I61ace7ccf7ff807ef3c7219b36e08629a2251699 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5246 Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/abseil_cpp/default.nix | 7 | ||||
-rw-r--r-- | third_party/grpc/default.nix | 13 | ||||
-rw-r--r-- | third_party/protobuf/default.nix | 12 | ||||
-rw-r--r-- | third_party/re2/default.nix | 5 |
4 files changed, 0 insertions, 37 deletions
diff --git a/third_party/abseil_cpp/default.nix b/third_party/abseil_cpp/default.nix deleted file mode 100644 index bfc83831171a..000000000000 --- a/third_party/abseil_cpp/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, lib, ... }: - -let inherit (pkgs) cmake fullLlvm11Stdenv; -in pkgs.abseil-cpp.override { - stdenv = fullLlvm11Stdenv; - cxxStandard = "17"; -} diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix deleted file mode 100644 index bef5dd9d112f..000000000000 --- a/third_party/grpc/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ depot, pkgs, ... }: - -(pkgs.grpc.override { - protobuf = depot.third_party.protobuf; - stdenv = pkgs.fullLlvm11Stdenv; - abseil-cpp = depot.third_party.abseil_cpp; - re2 = depot.third_party.re2; -}).overrideAttrs (orig: rec { - cmakeFlags = orig.cmakeFlags ++ [ - "-DCMAKE_CXX_STANDARD_REQUIRED=ON" - "-DCMAKE_CXX_STANDARD=17" - ]; -}) diff --git a/third_party/protobuf/default.nix b/third_party/protobuf/default.nix deleted file mode 100644 index b30ff9de918c..000000000000 --- a/third_party/protobuf/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Pin protobuf to version 3.12, with LLVM. -{ depot, pkgs, ... }: - -pkgs.callPackage "${pkgs.path}/pkgs/development/libraries/protobuf/generic-v3.nix" { - version = "3.12.2"; - sha256 = "1lp368aa206vpic9fmax4k6llnmf28plfvkkm4vqhgphmjqykvl2"; - stdenv = pkgs.fullLlvm11Stdenv; - buildPackages = { - inherit (pkgs) which; - stdenv = pkgs.fullLlvm11Stdenv; - }; -} diff --git a/third_party/re2/default.nix b/third_party/re2/default.nix deleted file mode 100644 index 62bce9e2ee72..000000000000 --- a/third_party/re2/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -pkgs.re2.override { - stdenv = pkgs.fullLlvm11Stdenv; -} |