Commit be9859e8 authored by Dmitry Ivankov's avatar Dmitry Ivankov
Browse files

bazel_6: 6.0.0 -> 6.1.0 

Updating the updater script:
- `//external:all` -> `//external:*` to make it work with recent bazel versions

Avoiding chicken-egg problem by explicitly asking to first build previous version,
then update sources version, then use updater and previous version to update src-deps.

`bazel_self` may not necessarily build out of the box after just the sources version
bump and may depend on updater being run first, which can't run without `bazel_self`.
So listing steps to use old version to help updating to new version
parent 5ae751c4

pkgs/development/python-modules/tensorflow-probability/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ let 
    LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";



    fetchAttrs = {

      sha256 = "sha256-pST4R45mWC5j0ngkkRe+hmostaMploW0+BN3WKPt0t0=";

      sha256 = lib.fakeHash;

    };



    buildAttrs = {

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix

+9 −6
Original line number Diff line number Diff line
@@ -24,16 +24,19 @@ 
}:



let

  version = "6.0.0";

  version = "6.1.0";

  sourceRoot = ".";



  src = fetchurl {

    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";

    hash = "sha256-e8DFFFwZpW2CoI/OaQjF4aDnXk+/s7bxK03q5/SzjLw=";

    hash = "sha256-xLhWdVQc9m7ny3FRQJf91sX8DgJSckNhek8gymtPKTI=";

  };



  # Update with `eval $(nix-build -A bazel_6.updater)`,

  # then add new dependencies from the dict in ./src-deps.json as required.

  # Update with

  # 1. export BAZEL_SELF=$(nix-build -A bazel_6)

  # 2. update version and hash for sources above

  # 3. `eval $(nix-build -A bazel_6.updater)`

  # 4. add new dependencies from the dict in ./src-deps.json if required by failing build

  srcDeps = lib.attrsets.attrValues srcDepsSet;

  srcDepsSet =

    let
@@ -334,8 +337,8 @@ stdenv.mkDerivation rec { 
    #!${runtimeShell}

    (cd "${src_for_updater}" &&

        BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \

        "${bazel_self}"/bin/bazel \

            query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \

        "$BAZEL_SELF"/bin/bazel \

            query 'kind(http_archive, //external:*) + kind(http_file, //external:*) + kind(distdir_tar, //external:*) + kind(git_repository, //external:*)' \

            --loading_phase_threads=1 \

            --output build) \

    | "${python3}"/bin/python3 "${./update-srcDeps.py}" \

pkgs/development/tools/build-managers/bazel/bazel_6/no-arc.patch

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ index 990afe3e8c..cd5b7b1b7a 100644 
 ])

 

 DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """

-  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -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 $@ $< && \

+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \

+  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \

+      -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \

   env -i codesign --identifier $@ --force --sign - $@

 """
@@ -20,7 +20,7 @@ index 2b819f07ec..a98ce37673 100644 
@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):

         "macosx",

         "clang",

         "-mmacosx-version-min=10.9",

         "-mmacosx-version-min=10.13",

-        "-fobjc-arc",

         "-framework",

         "CoreServices",

pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json

+208 −108

File changed.

Preview size limit exceeded, changes collapsed.