chore(3p): bump NixOS channels to 2021-11-03
* //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>
This commit is contained in:
parent
4f71638e49
commit
9b6497e5da
3 changed files with 6 additions and 4 deletions
1
third_party/abseil_cpp/default.nix
vendored
1
third_party/abseil_cpp/default.nix
vendored
|
@ -3,6 +3,7 @@
|
|||
let inherit (pkgs) cmake fullLlvm11Stdenv;
|
||||
in pkgs.abseil-cpp.override {
|
||||
stdenv = fullLlvm11Stdenv;
|
||||
cxxStandard = "17";
|
||||
}
|
||||
|
||||
/* TODO(tazjin): update abseil subtree
|
||||
|
|
1
third_party/grpc/default.nix
vendored
1
third_party/grpc/default.nix
vendored
|
@ -8,5 +8,6 @@
|
|||
}).overrideAttrs(orig: rec {
|
||||
cmakeFlags = orig.cmakeFlags ++ [
|
||||
"-DCMAKE_CXX_STANDARD_REQUIRED=ON"
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
];
|
||||
})
|
||||
|
|
8
third_party/nixpkgs/default.nix
vendored
8
third_party/nixpkgs/default.nix
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue