2 files changed, 48 insertions, 2 deletions

diff --git a/guix-science/packages/bazel.scm b/guix-science/packages/bazel.scm
index 7fb13b2..e7c3a96 100644
--- a/guix-science/packages/bazel.scm
+++ b/guix-science/packages/bazel.scm
@@ -1,4 +1,4 @@
-;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2023, 2024 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
@@ -88,7 +88,8 @@
                 "0j190j7vjknlw1cgynb3r8vlv0j6i9lac6s5payf4fqrb2ngxmwc"))
               (patches
                (search-patches "patches/bazel-mock-repos.patch"
-                               "patches/bazel-workspace.patch"))
+                               "patches/bazel-workspace.patch"
+                               "patches/bazel-recreate-markers.patch"))
               ;; This is just a start.  There are so many more jars.
               (snippet
                '(for-each delete-file
diff --git a/patches/bazel-recreate-markers.patch b/patches/bazel-recreate-markers.patch
new file mode 100644
index 0000000..8c64d8f
--- /dev/null
+++ b/patches/bazel-recreate-markers.patch
@@ -0,0 +1,45 @@
+This patch was taken from Nixpkgs.  It forces Bazel to recreate a
+repository marker's hash instead of aborting.  This allows us to
+bundle all inputs in advance and modify them as needed without having
+to worry about Bazel rejecting the bundled repositories.
+
+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
+index 25fbdcac9d..49616d37df 100644
+--- 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
+@@ -568,22 +568,7 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
+       String content;
+       try {
+         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
+-        String markerRuleKey = readMarkerFile(content, markerData);
+-        boolean verified = false;
+-        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)) {
+-          verified = handler.verifyMarkerData(rule, markerData, env);
+-          if (env.valuesMissing()) {
+-            return null;
+-          }
+-        }
+-
+-        if (verified) {
+-          return new Fingerprint().addString(content).digestAndReset();
+-        } else {
+-          // So that we are in a consistent state if something happens while fetching the repository
+-          markerPath.delete();
+-          return null;
+-        }
++        return new Fingerprint().addString(content).digestAndReset();
+       } catch (IOException e) {
+         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
+       }
+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
+index 1a45b8a3a2..a6b73213f6 100644
+--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
+@@ -152,7 +152,6 @@ public class JavaSubprocessFactory implements SubprocessFactory {
+     ProcessBuilder builder = new ProcessBuilder();
+     builder.command(params.getArgv());
+     if (params.getEnv() != null) {
+-      builder.environment().clear();
+       builder.environment().putAll(params.getEnv());
+     }
+