pkgs/development/tools/build-managers/bazel/nix-hacks.patch

   1 diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
   2 index 8e772005cd..6ffa1c919c 100644
   3 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
   4 +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
   5 @@ -432,25 +432,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
   6        String content;
   7        try {
   8          content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
   9 -        String markerRuleKey = readMarkerFile(content, markerData);
  10 -        boolean verified = false;
  11 -        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)
  12 -            && Objects.equals(
  13 -                markerData.get(MANAGED_DIRECTORIES_MARKER),
  14 -                this.markerData.get(MANAGED_DIRECTORIES_MARKER))) {
  15 -          verified = handler.verifyMarkerData(rule, markerData, env);
  16 -          if (env.valuesMissing()) {
  17 -            return null;
  18 -          }
  19 -        }
  20 -
  21 -        if (verified) {
  22 -          return new Fingerprint().addString(content).digestAndReset();
  23 -        } else {
  24 -          // So that we are in a consistent state if something happens while fetching the repository
  25 -          markerPath.delete();
  26 -          return null;
  27 -        }
  28 +        return new Fingerprint().addString(content).digestAndReset();
  29        } catch (IOException e) {
  30          throw new RepositoryFunctionException(e, Transience.TRANSIENT);
  31        }
  32 diff --git a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
  33 index c282d57ab6..f9b0c08627 100644
  34 --- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
  35 +++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
  36 @@ -146,7 +146,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
  37      ProcessBuilder builder = new ProcessBuilder();
  38      builder.command(params.getArgv());
  39      if (params.getEnv() != null) {
  40 -      builder.environment().clear();
  41        builder.environment().putAll(params.getEnv());
  42      }
  43