From 9b6497e5da2c29bfc109a62390071c94684e78d5 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Wed, 3 Nov 2021 20:39:58 +0100
Subject: chore(3p): bump NixOS channels to 2021-11-03
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* //third_party/{abseil_cpp, grpc}: fix linker problem by passing the
  C++ standard to use explicitly. nixpkgs upstream stopped passing this
  to abseil between bumps and the way this problem manifests itself is
  linker errors, because… C++, I suppose.

Change-Id: I932ea70befee90984ae2e575dfc23f5c601cd289
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3769
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
---
 third_party/abseil_cpp/default.nix | 1 +
 third_party/grpc/default.nix       | 1 +
 third_party/nixpkgs/default.nix    | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/third_party/abseil_cpp/default.nix b/third_party/abseil_cpp/default.nix
index c4c1ca174e79..66ab4f6ba143 100644
--- a/third_party/abseil_cpp/default.nix
+++ b/third_party/abseil_cpp/default.nix
@@ -3,6 +3,7 @@
 let inherit (pkgs) cmake fullLlvm11Stdenv;
 in pkgs.abseil-cpp.override {
   stdenv = fullLlvm11Stdenv;
+  cxxStandard = "17";
 }
 
 /* TODO(tazjin): update abseil subtree
diff --git a/third_party/grpc/default.nix b/third_party/grpc/default.nix
index c41e66e58381..2ef67d402858 100644
--- a/third_party/grpc/default.nix
+++ b/third_party/grpc/default.nix
@@ -8,5 +8,6 @@
 }).overrideAttrs(orig: rec {
   cmakeFlags = orig.cmakeFlags ++ [
     "-DCMAKE_CXX_STANDARD_REQUIRED=ON"
+    "-DCMAKE_CXX_STANDARD=17"
   ];
 })
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 8fb130f97f97..c11a9e682e02 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -15,14 +15,14 @@ let
 
   # Tracking nixos-unstable as of 2021-10-19.
   unstableHashes = {
-    commit = "5f0194220f2402b06f7f79bba6351895facb5acb";
-    sha256 = "0h2j0ivbp3b84d38h8s06s2yvnwqy80f4i1a75jd11m45m804n3s";
+    commit = "b67e752c29f18a0ca5534a07661366d6a2c2e649";
+    sha256 = "1n47f7r8cm9pcsz7vl4nxjfvs0fgzvcmjda5h0inz3yx9vghp5xm";
   };
 
   # Tracking nixos-21.05 as of 2021-10-21.
   stableHashes = {
-    commit = "70904d4a9927a4d6e05c72c4aaac4370e05107f3";
-    sha256 = "08vvir0npyrdx85ypiannwzvyryqdw3749bghffhdsq2dgz1cx8z";
+    commit = "372e59d2af704bffd133cbe029f1d5efe73ba6fb";
+    sha256 = "1fifb823qvklsn0brvggnaq60zgvi4axmgf6hxbpgz0bna6z6zy9";
   };
 
   # import the nixos-unstable package set, or optionally use the
-- 
cgit 1.4.1