Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bazel_6: 6.4.0 -> 6.5.0 #283480

Merged
merged 7 commits into from
Apr 25, 2024
Merged

bazel_6: 6.4.0 -> 6.5.0 #283480

merged 7 commits into from
Apr 25, 2024

Conversation

avdv
Copy link
Member

@avdv avdv commented Jan 24, 2024

Description of changes

Upgrades to the latest 6.x release. Fixes #273500

  • bazel_6: 6.4.0 -> 6.5.0
  • bazel_6: Add check to assert GSON serialization works

https://github.com/bazelbuild/bazel/releases/tag/6.5.0

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@avdv avdv mentioned this pull request Jan 24, 2024
Closed
13 tasks
@avdv
Copy link
Member Author

avdv commented Jan 25, 2024

@ofborg build envoy python3Packages.jaxlib python3Packages.jaxlibWithCuda python3Packages.tensorflow-probability

@uri-canva
Copy link
Contributor

Waiting for ready to review.

@avdv avdv force-pushed the bazel_6.5.0 branch 2 times, most recently from 898b8e7 to a311452 Compare January 30, 2024 16:28
@avdv
Copy link
Member Author

avdv commented Jan 31, 2024

This is almost ready, but unfortunately tests fail for Darwin. If somebody could have a look there, that would be great.

@avdv avdv mentioned this pull request Feb 7, 2024
Merged
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Mar 4, 2024
@avdv avdv force-pushed the bazel_6.5.0 branch 2 times, most recently from 366bf8e to abccd6c Compare March 13, 2024 10:16
@avdv
Copy link
Member Author

avdv commented Mar 14, 2024

Now, the builds on Darwin aarch64 and x86_64 are failing as follows, respectively:

error: a 'aarch64-linux' with features {} is required to build '/nix/store/9jda53vr01g2ma3kp0n46cn4m9s8gsh8-append-initrd-secrets.drv', but I am a 'aarch64-darwin' with features {benchmark, big-parallel, nixos-test}

error: a 'x86_64-linux' with features {} is required to build '/nix/store/rsjmz848mv48kil2s92vnzy4n7q53rcz-builder.pl.drv', but I am a 'aarch64-darwin' with features {benchmark, big-parallel, nixos-test}

What gives? Especially that for the x86_64-darwin build, the error mentions that it actually is an aarch64 machine is quite a bit surprising. But at least this would explain Bazel test failures I have seen before where it would fail because it was looking for a cc-compiler-darwin-aarch64 but the local-config-cc only configured a cc toolchain for x86-64_darwin...

@avdv avdv mentioned this pull request Mar 15, 2024
Closed
avdv and others added 6 commits April 8, 2024 16:40
@avdv
bazel_6: 6.4.0 -> 6.5.0
7cb1b52
@avdv
bazel_6: Add check to assert GSON serialization works
6528de1 
See NixOS#273500
@avdv
bazel_6: Skip building the execlog parser on darwin
bccdc67 
This currently fails with:
```
       > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/uncompr.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root.
       > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/zutil.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root.
       > Target //src/tools/execlog:parser_deploy.jar failed to build
```
@avdv
bazel_6: Add patch for system sleep on Darwin
bb8574d 
This re-uses the same patch as bazel_7 which indeed is also necessary here, since
otherwise building bazel_6 failed with

```
FATAL: CHECK failed: (success) == (0):
```

at https://github.com/bazelbuild/bazel/blob/d839db66ee86bc906a9789e99d11e0b85aba20be/src/main/native/darwin/sleep_prevention_jni.cc#L39
@avdv
bazel_6: Add sigtool and set up codesign allocate appropriately
a75d0a7
@avdv
bazel_6: Enable local networking for tests on Darwin
4f857cd
@olebedev olebedev removed their request for review April 10, 2024 23:16
@avdv
Copy link
Member Author

avdv commented Apr 11, 2024

@uri-canva I think this is basically ready-for review, despite there being multiple problems:

  1. tests fail on darwin x86_64 and aarch64 but...
  2. tests seem to pass with my debugging change (so I would want to keep it but reword it) except that...
  3. currently darwin aarch64 builds (in general? I have another PR with the same problem) do not run and ...
  4. when I update the fixed hashes for dependent packages CI for darwin will fail because of this issue

@avdv avdv marked this pull request as ready for review April 11, 2024 09:08
@avdv avdv requested a review from Profpatsch as a code owner April 11, 2024 09:08
@marsam marsam merged commit 05d79f2 into NixOS:master Apr 25, 2024
23 of 24 checks passed
@vcunat
Copy link
Member

vcunat commented Apr 26, 2024 •
edited
Loading

FYI, review tools say that many builds regressed (transitively) due to this merge with log like
https://hydra.nixos.org/build/257642087/nixlog/5/tail

@avdv avdv deleted the bazel_6.5.0 branch April 26, 2024 08:21
@avdv avdv mentioned this pull request Apr 26, 2024
Merged
14 tasks
@avdv
Copy link
Member Author

avdv commented Apr 26, 2024

FYI, review tools say that many builds regressed due to this merge with log like hydra.nixos.org/build/257642087/nixlog/5/tail

I have created a PR to fix that: #306940

@samuela
Copy link
Member

samuela commented Apr 26, 2024

Hi folks, this PR broke python3Packages.jaxlib and consequnetly the rest of the JAX ecosystem. Could you please patch jaxlib or revert this?

@samuela samuela mentioned this pull request Apr 26, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marsam marsam marsam approved these changes

@aherrmann aherrmann Awaiting requested review from aherrmann

@mboes mboes Awaiting requested review from mboes

@groodt groodt Awaiting requested review from groodt

@uri-canva uri-canva Awaiting requested review from uri-canva

@ylecornec ylecornec Awaiting requested review from ylecornec

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bazel_6: MODULE.bazel.lock file is empty
5 participants
@avdv @uri-canva @vcunat @samuela @marsam