summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Maudoux <guillaume.maudoux@tweag.io>2023-10-30 09:39:26 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-01-02 08:19:48 +0000
commitdf9638577ec745866596097f4473378a6c534fd5 (patch)
tree1b6e7226e57b47cbb39f99a6eedc9e5e26134d75
parentBump to 7.0.0rc2 (diff)
downloadnixpkgs-df9638577ec745866596097f4473378a6c534fd5.tar.gz
bazel_7: cleanup changes made to common tests
(cherry picked from commit 5151e14e2c01bc5098213c33dbd5d83f7b5d1c80)
-rw-r--r--pkgs/development/tools/build-managers/bazel/bash-tools-test.nix2
-rw-r--r--pkgs/development/tools/build-managers/bazel/bazel_5/default.nix2
-rw-r--r--pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix183
-rw-r--r--pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix2
-rw-r--r--pkgs/development/tools/build-managers/bazel/cpp-test.nix20
-rw-r--r--pkgs/development/tools/build-managers/bazel/java-test.nix27
-rw-r--r--pkgs/development/tools/build-managers/bazel/protobuf-test.nix175
-rw-r--r--pkgs/development/tools/build-managers/bazel/shebang-test.nix1
8 files changed, 293 insertions, 119 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index e48dd6c20d98..b7bfd8b81bd5 100644
--- a/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
@@ -1,4 +1,4 @@
-{ lib, writeText, bazel, runLocal, bazelTest, distDir, extraBazelArgs ? ""}:
+{ writeText, bazel, runLocal, bazelTest, distDir, extraBazelArgs ? ""}:
# Tests that certain executables are available in bazel-executed bash shells.
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
index e662c14fa399..08944413b7a0 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
@@ -287,7 +287,7 @@ stdenv.mkDerivation rec {
sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k";
};
- in (lib.optionalSttrs (!stdenv.hostPlatform.isDarwin) {
+ in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
# `extracted` doesn’t work on darwin
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;};
}) // {
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
new file mode 100644
index 000000000000..850fbba08c0c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
@@ -0,0 +1,183 @@
+{ bazel
+, bazelTest
+, fetchFromGitHub
+, fetchurl
+, stdenv
+, darwin
+, extraBazelArgs ? ""
+, lib
+, openjdk8
+, jdk11_headless
+, runLocal
+, runtimeShell
+, writeScript
+, writeText
+, distDir
+, Foundation
+, callPackage
+, libtool
+, lndir
+, repoCache
+, tree
+}:
+
+let
+
+ lockfile = ./tests.MODULE.bazel.lock;
+
+ protocbufRepoCache = callPackage ./bazel-repository-cache.nix {
+ # We are somewhat lucky that bazel's own lockfile works for our tests.
+ # Use extraDeps if the tests need things that are not in that lockfile.
+ # But most test dependencies are bazel's builtin deps, so that at least aligns.
+ inherit lockfile;
+
+ # Remove platform-specific binaries, as they are large and useless.
+ requiredDepNamePredicate = name:
+ null == builtins.match ".*(macos|osx|linux|win|android|maven).*" name;
+ };
+
+ MODULE = writeText "MODULE.bazel" ''
+ bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
+ bazel_dep(name = "protobuf", version = "21.7")
+ bazel_dep(name = "zlib", version = "1.3")
+ '';
+
+ WORKSPACE = writeText "WORKSPACE" ''
+ workspace(name = "our_workspace")
+
+ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+ http_archive(
+ name = "rules_proto",
+ sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
+ strip_prefix = "rules_proto-5.3.0-21.7",
+ urls = [
+ "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
+ ],
+ )
+ load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+ rules_proto_dependencies()
+ rules_proto_toolchains()
+ '';
+
+ personProto = writeText "person.proto" ''
+ syntax = "proto3";
+
+ package person;
+
+ message Person {
+ string name = 1;
+ int32 id = 2;
+ string email = 3;
+ }
+ '';
+
+ personBUILD = writeText "BUILD" ''
+ load("@rules_proto//proto:defs.bzl", "proto_library")
+
+ proto_library(
+ name = "person_proto",
+ srcs = ["person.proto"],
+ visibility = ["//visibility:public"],
+ )
+
+ java_proto_library(
+ name = "person_java_proto",
+ deps = [":person_proto"],
+ )
+
+ cc_proto_library(
+ name = "person_cc_proto",
+ deps = [":person_proto"],
+ )
+ '';
+
+ toolsBazel = writeScript "bazel" ''
+ #! ${runtimeShell}
+
+ export CXX='${stdenv.cc}/bin/clang++'
+ export LD='${darwin.cctools}/bin/ld'
+ export LIBTOOL='${darwin.cctools}/bin/libtool'
+ export CC='${stdenv.cc}/bin/clang'
+
+ # XXX: hack for macosX, this flags disable bazel usage of xcode
+ # See: https://github.com/bazelbuild/bazel/issues/4231
+ export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+ export HOMEBREW_RUBY_PATH="foo"
+
+ exec "$BAZEL_REAL" "$@"
+ '';
+
+ workspaceDir = runLocal "our_workspace" { } (''
+ mkdir $out
+ cp --no-preserve=all ${MODULE} $out/MODULE.bazel
+ cp --no-preserve=all ${./tests.MODULE.bazel.lock} $out/MODULE.bazel.lock
+ #cp ${WORKSPACE} $out/WORKSPACE
+ touch $out/WORKSPACE
+ touch $out/BUILD.bazel
+ mkdir $out/person
+ cp --no-preserve=all ${personProto} $out/person/person.proto
+ cp --no-preserve=all ${personBUILD} $out/person/BUILD.bazel
+ ''
+ + (lib.optionalString stdenv.isDarwin ''
+ echo 'tools bazel created'
+ mkdir $out/tools
+ install ${toolsBazel} $out/tools/bazel
+ ''));
+
+ testBazel = bazelTest {
+ name = "bazel-test-protocol-buffers";
+ inherit workspaceDir;
+ bazelPkg = bazel;
+ buildInputs = [
+ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
+ tree
+ bazel
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ Foundation
+ darwin.objc4
+ ];
+
+ bazelScript = ''
+ # Augment bundled repository_cache with our extra paths
+ mkdir -p $PWD/.repository_cache/content_addressable
+ cp -r --no-preserve=all ${repoCache}/content_addressable/* \
+ $PWD/.repository_cache/content_addressable
+ cp -r --no-preserve=all ${protocbufRepoCache}/content_addressable/* \
+ $PWD/.repository_cache/content_addressable
+
+ tree $PWD/.repository_cache
+
+ ${bazel}/bin/bazel \
+ build \
+ --repository_cache=$PWD/.repository_cache \
+ ${extraBazelArgs} \
+ --enable_bzlmod \
+ --verbose_failures \
+ //... \
+ '' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
+ --host_javabase='@local_jdk//:jdk' \
+ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+ --javabase='@local_jdk//:jdk' \
+ '' + lib.optionalString (stdenv.isDarwin) ''
+ --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
+ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
+ '';
+ #--cxxopt=-framework --cxxopt=Foundation \
+ #--linkopt=-F${Foundation}/Library/Frameworks \
+ #--host_linkopt=-F${Foundation}/Library/Frameworks \
+
+ #--distdir=$PWD/.repository_cache \
+ #--verbose_failures \
+ #--curses=no \
+ #--sandbox_debug \
+ #--strict_java_deps=off \
+ #--strict_proto_deps=off \
+ #--repository_cache=${repoCache} \
+ #--distdir=${repoCache} \
+ };
+
+in
+testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
index 2cd288a32859..64f08352f541 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix
@@ -145,7 +145,7 @@ let
cpp = callBazelTest ../cpp-test.nix args;
java = callBazelTest ../java-test.nix args;
pythonBinPath = callBazelTest ../python-bin-path-test.nix args;
- protobuf = callBazelTest ../protobuf-test.nix (args // { repoCache = testsRepoCache; });
+ protobuf = callBazelTest ./protobuf-test.nix (args // { repoCache = testsRepoCache; });
});
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index 6fe4256cb246..22be00312be1 100644
--- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -1,4 +1,5 @@
-{ bazel
+{
+ bazel
, bazelTest
, bazel-examples
, stdenv
@@ -10,7 +11,7 @@
, writeScript
, writeText
, distDir
-, Foundation
+, Foundation ? null
}:
let
@@ -30,7 +31,7 @@ let
exec "$BAZEL_REAL" "$@"
'';
- workspaceDir = runLocal "our_workspace" { } (''
+ workspaceDir = runLocal "our_workspace" {} (''
cp -r ${bazel-examples}/cpp-tutorial/stage3 $out
find $out -type d -exec chmod 755 {} \;
''
@@ -44,20 +45,17 @@ let
inherit workspaceDir;
bazelPkg = bazel;
bazelScript = ''
- ${bazel}/bin/bazel info output_base
${bazel}/bin/bazel build //... \
--verbose_failures \
- --sandbox_debug \
--distdir=${distDir} \
--curses=no \
${extraBazelArgs} \
'' + lib.optionalString (stdenv.isDarwin) ''
- --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
- --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
- --linkopt=-Wl,-F${Foundation}/Library/Frameworks \
- --linkopt=-L${darwin.libobjc}/lib \
+ --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
+ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
+ --linkopt=-Wl,-F${Foundation}/Library/Frameworks \
+ --linkopt=-L${darwin.libobjc}/lib \
'';
};
-in
-testBazel
+in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix
index 59235ee88611..91fade474d6f 100644
--- a/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -31,7 +31,7 @@ let
exec "$BAZEL_REAL" "$@"
'';
- workspaceDir = runLocal "our_workspace" { } (''
+ workspaceDir = runLocal "our_workspace" {} (''
cp -r ${bazel-examples}/java-tutorial $out
find $out -type d -exec chmod 755 {} \;
''
@@ -44,34 +44,25 @@ let
name = "bazel-test-java";
inherit workspaceDir;
bazelPkg = bazel;
- buildInputs = [
- (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
- ];
+ buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];
bazelScript = ''
${bazel}/bin/bazel \
run \
--announce_rc \
- --toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type' \
+ ${lib.optionalString (lib.strings.versionOlder "5.0.0" bazel.version)
+ "--toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type'"
+ } \
--distdir=${distDir} \
--verbose_failures \
--curses=no \
--strict_java_deps=off \
//:ProjectRunner \
'' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
- --host_javabase='@local_jdk//:jdk' \
- --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
- --javabase='@local_jdk//:jdk' \
+ --host_javabase='@local_jdk//:jdk' \
+ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+ --javabase='@local_jdk//:jdk' \
'' + extraBazelArgs;
};
- # --repo_env=JAVA_HOME=${jdk11_headless}/${if stdenv.hostPlatform.isDarwin then "/zulu-17.jdk/Contents/Home" else "/lib/openjdk"} \
- #--java_language_version=17 \
- #--java_language_version=17 \
- #--java_runtime_version=local_jdk \
- # --java_language_version=11 \
- # --tool_java_runtime_version=local_jdk_17 \
- # --tool_java_language_version=17 \
- #--java_runtime_version=local_jdk_11 \
-in
-testBazel
+in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index a76f8d6799d5..ddb2efdbf8e8 100644
--- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -1,10 +1,10 @@
-{ bazel
+{
+ bazel
, bazelTest
, fetchFromGitHub
, fetchurl
, stdenv
, darwin
-, extraBazelArgs ? ""
, lib
, openjdk8
, jdk11_headless
@@ -13,52 +13,89 @@
, writeScript
, writeText
, distDir
-, Foundation
-, callPackage
-, libtool
-, lndir
-, repoCache
-, tree
}:
let
+ com_google_protobuf = fetchFromGitHub {
+ owner = "protocolbuffers";
+ repo = "protobuf";
+ rev = "v3.13.0";
+ sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd";
+ };
- lockfile = ./bazel_7/tests.MODULE.bazel.lock;
+ bazel_skylib = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "bazel-skylib";
+ rev = "2ec2e6d715e993d96ad6222770805b5bd25399ae";
+ sha256 = "1z2r2vx6kj102zvp3j032djyv99ski1x1sl4i3p6mswnzrzna86s";
+ };
- protocbufRepoCache = callPackage ./bazel_7/bazel-repository-cache.nix {
- # We are somewhat lucky that bazel's own lockfile works for our tests.
- # Use extraDeps if the tests need things that are not in that lockfile.
- # But most test dependencies are bazel's builtin deps, so that at least aligns.
- inherit lockfile;
+ rules_python = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "rules_python";
+ rev = "c8c79aae9aa1b61d199ad03d5fe06338febd0774";
+ sha256 = "1zn58wv5wcylpi0xj7riw34i1jjpqahanxx8y9srwrv0v93b6pqz";
+ };
- # Take all the rules_ deps, bazel_ deps and their transitive dependencies,
- # but none of the platform-specific binaries, as they are large and useless.
- requiredDepNamePredicate = name:
- null == builtins.match ".*(macos|osx|linux|win|android|maven).*" name;
+ rules_proto = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "rules_proto";
+ rev = "a0761ed101b939e19d83b2da5f59034bffc19c12";
+ sha256 = "09lqfj5fxm1fywxr5w8pnpqd859gb6751jka9fhxjxjzs33glhqf";
};
- MODULE = writeText "MODULE.bazel" ''
- bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
- bazel_dep(name = "protobuf", version = "21.7")
- bazel_dep(name = "zlib", version = "1.3")
- '';
+ net_zlib = fetchurl rec {
+ url = "https://zlib.net/zlib-1.2.11.tar.gz";
+ sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1";
+
+ passthru.sha256 = sha256;
+ };
WORKSPACE = writeText "WORKSPACE" ''
workspace(name = "our_workspace")
+ load("//:proto-support.bzl", "protobuf_deps")
+ protobuf_deps()
+ load("@rules_proto//proto:repositories.bzl", "rules_proto_toolchains")
+ rules_proto_toolchains()
+ '';
+
+ protoSupport = writeText "proto-support.bzl" ''
+ """Load dependencies needed to compile the protobuf library as a 3rd-party consumer."""
+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
- http_archive(
- name = "rules_proto",
- sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
- strip_prefix = "rules_proto-5.3.0-21.7",
- urls = [
- "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
- ],
- )
- load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
- rules_proto_dependencies()
- rules_proto_toolchains()
+ def protobuf_deps():
+ """Loads common dependencies needed to compile the protobuf library."""
+
+ if "zlib" not in native.existing_rules():
+ # proto_library, cc_proto_library, and java_proto_library rules implicitly
+ # depend on @com_google_protobuf for protoc and proto runtimes.
+ # This statement defines the @com_google_protobuf repo.
+ native.local_repository(
+ name = "com_google_protobuf",
+ path = "${com_google_protobuf}",
+ )
+ native.local_repository(
+ name = "bazel_skylib",
+ path = "${bazel_skylib}",
+ )
+ native.local_repository(
+ name = "rules_proto",
+ path = "${rules_proto}",
+ )
+ native.local_repository(
+ name = "rules_python",
+ path = "${rules_python}",
+ )
+
+ http_archive(
+ name = "zlib",
+ build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+ sha256 = "${net_zlib.sha256}",
+ strip_prefix = "zlib-1.2.11",
+ urls = ["file://${net_zlib}"],
+ )
'';
personProto = writeText "person.proto" ''
@@ -105,80 +142,46 @@ let
# See: https://github.com/bazelbuild/bazel/issues/4231
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
- export HOMEBREW_RUBY_PATH="foo"
-
exec "$BAZEL_REAL" "$@"
'';
- workspaceDir = runLocal "our_workspace" { } (''
+ workspaceDir = runLocal "our_workspace" {} (''
mkdir $out
- cp --no-preserve=all ${MODULE} $out/MODULE.bazel
- cp --no-preserve=all ${./bazel_7/tests.MODULE.bazel.lock} $out/MODULE.bazel.lock
- #cp ${WORKSPACE} $out/WORKSPACE
- touch $out/WORKSPACE
+ cp ${WORKSPACE} $out/WORKSPACE
touch $out/BUILD.bazel
+ cp ${protoSupport} $out/proto-support.bzl
mkdir $out/person
- cp --no-preserve=all ${personProto} $out/person/person.proto
- cp --no-preserve=all ${personBUILD} $out/person/BUILD.bazel
+ cp ${personProto} $out/person/person.proto
+ cp ${personBUILD} $out/person/BUILD.bazel
''
+ (lib.optionalString stdenv.isDarwin ''
- echo 'tools bazel created'
mkdir $out/tools
- install ${toolsBazel} $out/tools/bazel
+ cp ${toolsBazel} $out/tools/bazel
''));
testBazel = bazelTest {
name = "bazel-test-protocol-buffers";
inherit workspaceDir;
bazelPkg = bazel;
- buildInputs = [
- (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless)
- tree
- bazel
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- Foundation
- darwin.objc4
- ];
-
+ buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];
bazelScript = ''
- # Augment bundled repository_cache with our extra paths
- mkdir -p $PWD/.repository_cache/content_addressable
- cp -r --no-preserve=all ${repoCache}/content_addressable/* \
- $PWD/.repository_cache/content_addressable
- cp -r --no-preserve=all ${protocbufRepoCache}/content_addressable/* \
- $PWD/.repository_cache/content_addressable
-
- tree $PWD/.repository_cache
-
${bazel}/bin/bazel \
build \
- --repository_cache=$PWD/.repository_cache \
- ${extraBazelArgs} \
- --enable_bzlmod \
+ --distdir=${distDir} \
--verbose_failures \
+ --curses=no \
+ --sandbox_debug \
+ --strict_java_deps=off \
+ --strict_proto_deps=off \
//... \
'' + lib.optionalString (lib.strings.versionOlder bazel.version "5.0.0") ''
- --host_javabase='@local_jdk//:jdk' \
- --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
- --javabase='@local_jdk//:jdk' \
+ --host_javabase='@local_jdk//:jdk' \
+ --java_toolchain='@bazel_tools//tools/jdk:toolchain_hostjdk8' \
+ --javabase='@local_jdk//:jdk' \
'' + lib.optionalString (stdenv.isDarwin) ''
- --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
- --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
+ --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
+ --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
'';
- #--cxxopt=-framework --cxxopt=Foundation \
- #--linkopt=-F${Foundation}/Library/Frameworks \
- #--host_linkopt=-F${Foundation}/Library/Frameworks \
-
- #--distdir=$PWD/.repository_cache \
- #--verbose_failures \
- #--curses=no \
- #--sandbox_debug \
- #--strict_java_deps=off \
- #--strict_proto_deps=off \
- #--repository_cache=${repoCache} \
- #--distdir=${repoCache} \
};
-in
-testBazel
+in testBazel
diff --git a/pkgs/development/tools/build-managers/bazel/shebang-test.nix b/pkgs/development/tools/build-managers/bazel/shebang-test.nix
index aeaf48d690c5..d316b4650ddf 100644
--- a/pkgs/development/tools/build-managers/bazel/shebang-test.nix
+++ b/pkgs/development/tools/build-managers/bazel/shebang-test.nix
@@ -22,7 +22,6 @@ let
bazelPkg = bazel;
bazelScript = ''
set -ueo pipefail
-
FAIL=
check_shebangs() {
local dir="$1"