diff --git a/bazel_tools/rules-nixpkgs-llvm-cov.patch b/bazel_tools/rules-nixpkgs-llvm-cov.patch deleted file mode 100644 index 1ae7e2011dc8..000000000000 --- a/bazel_tools/rules-nixpkgs-llvm-cov.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/nixpkgs/toolchains/cc.nix b/nixpkgs/toolchains/cc.nix -index e2c766a..17ced5b 100644 ---- a/nixpkgs/toolchains/cc.nix -+++ b/nixpkgs/toolchains/cc.nix -@@ -68,7 +68,7 @@ in - # Determine toolchain tool paths. - # - # If a tool is not available then we use `bin/false` as a stand-in. -- declare -A TOOLS=( [ar]=ar [cpp]=cpp [dwp]=dwp [gcc]=cc [gcov]=gcov [ld]=ld [nm]=nm [objcopy]=objcopy [objdump]=objdump [strip]=strip ) -+ declare -A TOOLS=( [ar]=ar [cpp]=cpp [dwp]=dwp [gcc]=cc [gcov]=gcov [llvm-cov]=llvm-cov [ld]=ld [nm]=nm [objcopy]=objcopy [objdump]=objdump [strip]=strip ) - TOOL_NAMES=(''${!TOOLS[@]}) - declare -A TOOL_PATHS=() - for tool_name in ''${!TOOLS[@]}; do diff --git a/deps.bzl b/deps.bzl index a00fb05ddb73..ea1c92f28204 100644 --- a/deps.bzl +++ b/deps.bzl @@ -43,8 +43,8 @@ rules_haskell_patches = [ "@com_github_digital_asset_daml//bazel_tools:haskell-opt.patch", "@com_github_digital_asset_daml//bazel_tools:haskell-ghc-8.10.7-bindist.patch", ] -rules_nixpkgs_version = "c40b35f73e5ab1c0096d95abf63027a3b8054061" -rules_nixpkgs_sha256 = "47fffc870a25d82deedb887c32481a43a12f56b51e5002773046f81fbe3ea9df" +rules_nixpkgs_version = "81f61c4b5afcf50665b7073f7fce4c1755b4b9a3" +rules_nixpkgs_sha256 = "33fd540d0283cf9956d0a5a640acb1430c81539a84069114beaf9640c96d221a" rules_nixpkgs_patches = [ # On CI and locally we observe occasional segmantation faults # of nix. A known issue since Nix 2.2.2 is that HTTP2 support