diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 0e08fe4d737c..186d585d626e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -179,7 +179,7 @@ let in stdenv.mkDerivation rec { - pname = "bazel"; + pname = "bazel${ lib.optionalString enableNixHacks "-hacks" }"; inherit version; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 8129c3235f36..7b0e2a5d01bf 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -41,7 +41,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-cpp"; + name = "${bazel.pname}-test-cpp"; inherit workspaceDir; bazelPkg = bazel; bazelScript = '' diff --git a/pkgs/development/tools/build-managers/bazel/java-test.nix b/pkgs/development/tools/build-managers/bazel/java-test.nix index 91fade474d6f..ed4711f4027f 100644 --- a/pkgs/development/tools/build-managers/bazel/java-test.nix +++ b/pkgs/development/tools/build-managers/bazel/java-test.nix @@ -41,7 +41,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-java"; + name = "${bazel.pname}-test-java"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ]; diff --git a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix index cc78fca6a47c..963bad679c50 100644 --- a/pkgs/development/tools/build-managers/bazel/protobuf-test.nix +++ b/pkgs/development/tools/build-managers/bazel/protobuf-test.nix @@ -160,7 +160,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-protocol-buffers"; + name = "${bazel.pname}-test-protocol-buffers"; inherit workspaceDir; bazelPkg = bazel; buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ]; diff --git a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix index bd0f71a5d979..2538a2ae074a 100644 --- a/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix +++ b/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix @@ -71,7 +71,7 @@ let '')); testBazel = bazelTest { - name = "bazel-test-builtin-rules"; + name = "${bazel.pname}-test-builtin-rules"; inherit workspaceDir; bazelPkg = bazel; bazelScript = ''