commit 5d357d87ad3dc14bedbfd9e012eae5b8ff85f772
author Tim Windelschmidt <tim@monogon.tech> Thu Jul 10 18:47:15 2025 +0200
committer Tim Windelschmidt <tim@monogon.tech> Wed Jul 16 21:14:12 2025 +0000
tree 1791af9ca36aabd988b8db1c81516debbf9036da
parent 2b480f6eb860b94cf96f133f3700e08f18c76c40

treewide: remove FHSEnv

To remove the FHSenv, we have to patch rules_python to use
/usr/bin/env to resolve the path to bash instead of hardcoding it.
Additionally, we now bring a Nix-compatible Bazel 8.

Change-Id: Id51e7748eea6dd77185f43a52fe45b5110ba4a2b
Reviewed-on: https://review.monogon.dev/c/monogon/+/4427
Tested-by: Jenkins CI
Reviewed-by: Jan Schär <jan@monogon.tech>
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Reviewed-by: Leopold Schabel <leo@monogon.tech>

MODULE.bazel

diff --git a/MODULE.bazel b/MODULE.bazel
index f2e7a4e..8f0a7d2 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -89,6 +89,28 @@
     version = "2.82.2.bcr.5",
 )
 
+bazel_dep(name = "rules_python")
+single_version_override(
+    module_name = "rules_python",
+    patch_strip = 1,
+    patches = [
+        # TODO: Remove if upstream PR is merged
+        # https://github.com/bazel-contrib/rules_python/pull/3087
+        "//third_party/rules_python:use-usr-bin-env-bash.patch",
+    ],
+    version = "1.4.1",
+)
+
+bazel_dep(name = "rules_oci")
+single_version_override(
+    module_name = "rules_oci",
+    patch_strip = 1,
+    patches = [
+        "//third_party/rules_oci:use-default-shell-env.patch",
+    ],
+    version = "2.2.6",
+)
+
 bazel_dep(name = "zstd", version = "1.5.7")
 bazel_dep(name = "gperf", version = "3.1")
 bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
@@ -97,10 +119,8 @@
 bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 bazel_dep(name = "bazel_skylib", version = "1.8.0")
 bazel_dep(name = "rules_pkg", version = "1.1.0")
-bazel_dep(name = "rules_oci", version = "2.2.6")
 bazel_dep(name = "aspect_bazel_lib", version = "2.19.4")
 bazel_dep(name = "rules_multirun", version = "0.12.0")
-bazel_dep(name = "rules_python", version = "1.4.1")
 bazel_dep(name = "rules_cc", version = "0.1.2")
 bazel_dep(name = "rules_perl", version = "0.2.4")
 bazel_dep(name = "rules_proto", version = "7.1.0")
@@ -136,8 +156,17 @@
 
 register_toolchains("//build/toolchain/toolchain-bundle:all")
 
+# Rust config
 include("//build/bazel:rust.MODULE.bazel")
+
+# Go dependencies
 include("//build/bazel:go.MODULE.bazel")
+
+# OCI Config
 include("//build/bazel:oci.MODULE.bazel")
+
+# Third Party dependencies
 include("//build/bazel:third_party.MODULE.bazel")
+
+# Toolchain Bundle
 include("//build/bazel:toolchain.MODULE.bazel")