gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bazel_8: 8.4.1 -> 8.4.2 (#450259)

Browse Source
This commit is contained in:
Weijia Wang
2025-10-25 19:24:33 +00:00
committed by GitHub
parent cca043ffd1 d4c44593f0
commit ed355d46da
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/by-name/ba/bazel_8/examples.nix
View File

@@ -108,10 +108,10 @@ in
bazelVendorDepsFOD = { bazelVendorDepsFOD = {
outputHash = outputHash =
{ {
aarch64-darwin = "sha256-D5bwW35QuLLhVE22FDyV9Nl8N7ULx71wCHbzB81+Xx0="; aarch64-darwin = "sha256-0QtaPtcBljyhiJGwA8ctSpi+UQp/9q/ZoHUHORizmlY=";
aarch64-linux = "sha256-F5X/cwtHR6sVFe1DzNDaEnGMIPR0SnXq2iIxhQeqIV8="; aarch64-linux = "sha256-zpiwQ8OB8KhY+kxSXlSOd/zmoH1VGYDGgojf4Or04pQ=";
x86_64-darwin = "sha256-DXuPy68m3p6hlgEid7tpY8fGgvJWQTXth6h2kMSNFCc="; x86_64-darwin = "sha256-+tCDSuYkon1DEARwWTYABJbmysSNAK9vy0tCm8YsGjQ=";
x86_64-linux = "sha256-oNLDccQ/XPg1Nl/9V14NdgiQsRoTvpaA6hyynMb414A="; x86_64-linux = "sha256-wCWSRc20Yr/hdXn8szbhLAX7Oy3G5keyHTTdO0msnks=";
} }
.${stdenv.hostPlatform.system}; .${stdenv.hostPlatform.system};
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";

6
pkgs/by-name/ba/bazel_8/package.nix
View File

@@ -31,7 +31,7 @@
cctools, cctools,
# Allow to independently override the jdks used to build and run respectively # Allow to independently override the jdks used to build and run respectively
jdk_headless, jdk_headless,
version ? "8.4.1", version ? "8.4.2",
}: }:
let let
@@ -45,7 +45,7 @@ let
src = fetchzip { src = fetchzip {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-DqJqW7C1QODOS+vJrs/+ixsP3coZh80VdpPM4g0vxFI="; hash = "sha256-5oNYKHPaDkpunl6oC104Rh1wAEMWfLfvCFdGHlXZn4o=";
stripRoot = false; stripRoot = false;
}; };
@@ -144,9 +144,7 @@ stdenv.mkDerivation rec {
# Nixpkgs toolcahins do not support that (yet?) and get confused. # Nixpkgs toolcahins do not support that (yet?) and get confused.
# Also add an explicit /usr/bin prefix that will be patched below. # Also add an explicit /usr/bin prefix that will be patched below.
(replaceVars ./patches/xcode.patch { (replaceVars ./patches/xcode.patch {
usrBinEnv = "${coreutils}/bin/env";
clangDarwin = "${stdenv.cc}/bin/clang"; clangDarwin = "${stdenv.cc}/bin/clang";
codesign = "${darwin.sigtool}/bin/codesign";
}) })
# Revert preference for apple_support over rules_cc toolchain for now # Revert preference for apple_support over rules_cc toolchain for now

4
pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
View File

@@ -8,11 +8,11 @@ index b3dde1c838..a54bf8141d 100644
-# Depend on apple_support first and then rules_cc so that the Xcode toolchain -# Depend on apple_support first and then rules_cc so that the Xcode toolchain
-# from apple_support wins over the generic Unix toolchain from rules_cc. -# from apple_support wins over the generic Unix toolchain from rules_cc.
-bazel_dep(name = "apple_support", version = "1.18.1") -bazel_dep(name = "apple_support", version = "1.23.1")
+# Not Depend on apple_support first and then rules_cc so that the Xcode toolchain +# Not Depend on apple_support first and then rules_cc so that the Xcode toolchain
+# from apple_support not wins over the generic Unix toolchain from rules_cc. +# from apple_support not wins over the generic Unix toolchain from rules_cc.
bazel_dep(name = "rules_cc", version = "0.1.1") bazel_dep(name = "rules_cc", version = "0.1.1")
+bazel_dep(name = "apple_support", version = "1.18.1") +bazel_dep(name = "apple_support", version = "1.23.1")
# repo_name needs to be used, until WORKSPACE mode is to be supported in bazel_tools # repo_name needs to be used, until WORKSPACE mode is to be supported in bazel_tools
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")

10
pkgs/by-name/ba/bazel_8/patches/xcode.patch
View File

@@ -12,20 +12,16 @@ index 1bad14cba7..d312fe08bb 100755
cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
fi fi
diff --git a/tools/osx/BUILD b/tools/osx/BUILD diff --git a/tools/osx/BUILD b/tools/osx/BUILD
index 0358fb0ffe..1e6eae1f33 100644 index 5b99589ad4..3d3269772b 100644
--- a/tools/osx/BUILD --- a/tools/osx/BUILD
+++ b/tools/osx/BUILD +++ b/tools/osx/BUILD
@@ -27,9 +27,9 @@ exports_files([ @@ -27,7 +27,7 @@ exports_files([
]) ])
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """ DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ - /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
- -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
- env -i codesign --identifier $@ --force --sign - $@
+ @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \ + @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
+ -framework Foundation -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \ -framework Foundation -arch arm64 -arch x86_64 -o $@ $<
+ @usrBinEnv@ @codesign@ --identifier $@ --force --sign - $@
""" """
genrule(