···82 null != builtins.match "rules_java~.*~toolchains~remote_java_tools" name;
83 };
8400000000085 defaultShellUtils =
86 # Keep this list conservative. For more exotic tools, prefer to use
87 # @rules_nixpkgs to pull in tools from the nix repository. Example:
···331 done
332 '';
333334- # -e "s,%{cc},${stdenv.cc}/bin/clang,g" \
335 genericPatches = ''
336 # unzip builtins_bzl.zip so the contents get patched
337 builtins_bzl=src/main/java/com/google/devtools/build/lib/bazel/rules/builtins_bzl
···611 #
612 # in the nixpkgs checkout root to exercise them locally.
613 tests = callPackage ./tests.nix {
614- inherit Foundation bazel_self distDir repoCache runJdk;
00615 };
616617 updater = throw "TODO";
618619- inherit distDir repoCache;
620 };
621}
···82 null != builtins.match "rules_java~.*~toolchains~remote_java_tools" name;
83 };
8485+ # Two-in-one format
86+ testRepoCache = callPackage ./bazel-repository-cache.nix {
87+ inherit lockfile;
88+ # We use the release tarball that already has everything bundled,
89+ # But we need one extra dep required by our nonprebuilt java toolchains.
90+ requiredDepNamePredicate = name:
91+ null == builtins.match ".*(macos|osx|linux|win|apple|android).*" name;
92+ };
93+94 defaultShellUtils =
95 # Keep this list conservative. For more exotic tools, prefer to use
96 # @rules_nixpkgs to pull in tools from the nix repository. Example:
···340 done
341 '';
3420343 genericPatches = ''
344 # unzip builtins_bzl.zip so the contents get patched
345 builtins_bzl=src/main/java/com/google/devtools/build/lib/bazel/rules/builtins_bzl
···619 #
620 # in the nixpkgs checkout root to exercise them locally.
621 tests = callPackage ./tests.nix {
622+ inherit Foundation bazel_self runJdk;
623+ distDir = testRepoCache;
624+ repoCache = testRepoCache;
625 };
626627 updater = throw "TODO";
628629+ inherit distDir repoCache testRepoCache;
630 };
631}