mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 01:07:18 +03:00
38f424155a
* Update `rules_nixpgks` to HEAD Since [rules_nixpkgs#191] has been merged, we can drop the `rules-nixpkgs-arm.patch` from rules_nixpkgs. Also, rules_nixpkgs has been split into several components which need to be added explicitly in `deps.bzl`, see [#182]. [#191]: https://github.com/tweag/rules_nixpkgs/pull/191 [#182]: https://github.com/tweag/rules_nixpkgs/issues/182 * Adapt `compatibility/deps.bzl` * Update platforms repository to version 0.0.4 It has been updated in rules_nixpkgs, so this just follows suite. * Pass through `isClang` attribute for the cc-toolchain In rules_nixpkgs, this attribute is now used to determine whether the compiler is clang, see [#216]. [#216]: https://github.com/tweag/rules_nixpkgs/pull/216 CHANGELOG_BEGIN CHANGELOG_END
14 lines
527 B
Diff
14 lines
527 B
Diff
diff --git a/core/nixpkgs.bzl b/core/nixpkgs.bzl
|
|
index 16fe59c..d590d44 100644
|
|
--- a/core/nixpkgs.bzl
|
|
+++ b/core/nixpkgs.bzl
|
|
@@ -136,7 +136,7 @@ def _nixpkgs_package_impl(repository_ctx):
|
|
"The NIX_PATH environment variable is not inherited."
|
|
)
|
|
|
|
- expr_args = []
|
|
+ expr_args = ["--option", "http2", "false"]
|
|
if repository_ctx.attr.nix_file and repository_ctx.attr.nix_file_content:
|
|
fail("Specify one of 'nix_file' or 'nix_file_content', but not both.")
|
|
elif repository_ctx.attr.nix_file:
|