Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade nixpkgs #12280

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -220,27 +220,15 @@ def daml_deps():
# This should be kept in sync with the grpc version we get from Nix.
http_archive(
name = "com_github_grpc_grpc",
strip_prefix = "grpc-1.42.0",
urls = ["https://github.com/grpc/grpc/archive/v1.42.0.tar.gz"],
sha256 = "b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c",
strip_prefix = "grpc-1.43.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upgrading to keep it in sync with nix

urls = ["https://github.com/grpc/grpc/archive/v1.43.0.tar.gz"],
sha256 = "9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc",
patches = [
"@com_github_digital_asset_daml//bazel_tools:grpc-bazel-mingw.patch",
],
patch_args = ["-p1"],
)

if "com_google_absl" not in native.existing_rules():
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is pulled in by grpc and we don’t need a specific version.

http_archive(
name = "com_google_absl",
sha256 = "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
strip_prefix = "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
],
patch_args = ["-p1"],
)

if "com_google_protobuf" not in native.existing_rules():
http_archive(
name = "com_google_protobuf",
Expand Down
4 changes: 2 additions & 2 deletions nix/nixpkgs/default.src.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
"sha256": "162dywda2dvfj1248afxc45kcrg83appjd0nmdb541hl7rnncf02"
"rev": "defafc9a220440180a34f923be9772d9c89a8197",
"sha256": "1s6cf4yxzszwl8qgfsr0y0hr1dw1pawwk3nbryi0phri1npvaggj"
}
9 changes: 6 additions & 3 deletions nix/tools/bazel-cc-toolchain/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, binutils
, buildEnv
, darwin
, llvmPackages
, llvmPackages_7
, makeWrapper
, overrideCC
, runCommand
Expand All @@ -14,6 +14,9 @@
# https://github.com/NixOS/nixpkgs/pull/41589.
let cc-darwin =
with darwin.apple_sdk.frameworks;
# Note (MK): For now we pin to clang 7 since newer versions fail to build abseil.
let stdenv = llvmPackages_7.stdenv;
in
runCommand "cc-wrapper-bazel"
{
buildInputs = [ stdenv.cc makeWrapper ];
Expand All @@ -33,12 +36,12 @@ let cc-darwin =
makeWrapper ${stdenv.cc}/bin/cc $out/bin/cc \
--add-flags "-Wno-unused-command-line-argument \
-mmacosx-version-min=10.14 \
-isystem ${llvmPackages.libcxx}/include/c++/v1 \
-isystem ${llvmPackages_7.libcxx}/include/c++/v1 \
-F${CoreFoundation}/Library/Frameworks \
-F${CoreServices}/Library/Frameworks \
-F${Security}/Library/Frameworks \
-F${Foundation}/Library/Frameworks \
-L${llvmPackages.libcxx}/lib \
-L${llvmPackages_7.libcxx}/lib \
-L${darwin.libobjc}/lib"
'';

Expand Down