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.0.0-pre.20220720.3 -> 6.0.0 #206934

Merged
merged 3 commits into from
Jan 10, 2023
Merged

bazel_6: 6.0.0-pre.20220720.3 -> 6.0.0 #206934

merged 3 commits into from
Jan 10, 2023

Conversation

alloveras
Copy link
Contributor

Description of changes

https://github.com/bazelbuild/bazel/blob/master/CHANGELOG.md#release-600

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

olebedev
olebedev approved these changes Dec 20, 2022
View reviewed changes
Copy link
Member

@olebedev olebedev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@timothyklim
Copy link
Contributor

Can it backported to release-22.11?

@alloveras
Copy link
Contributor Author

Can it backported to release-22.11?

I presume it could be? I am really new to nixpkgs so I barely know what I am doing. Do you know if there is any documentation that I can follow to do the backport?

Also, the MacOS tests are still failing from what I can tell. I am not sure if we should have those fixed first and then consider any backports?

raphaelr
raphaelr reviewed Dec 20, 2022
View reviewed changes
Copy link
Contributor

@raphaelr raphaelr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash all commits into one.

Do you know if there is any documentation that I can follow to do the backport?

Yes, see Automatically backporting a Pull Request in the nixpkgs manual.

@alloveras
Copy link
Contributor Author

Please squash all commits into one.

Done ✅

Yes, see Automatically backporting a Pull Request in the nixpkgs manual.

Thanks for the pointer to the docs. Although, I don't seem to have permission to add the label to the PR 😕 ?

@ofborg ofborg bot requested review from olebedev and kalbasit December 20, 2022 08:33
@alloveras
Copy link
Contributor Author

I've tested building locally in a MacBook Pro 13" M1 and I am not able to reproduce the issues I see in CI. I presume the CI boxes are recycled very often and, even if sandbox is not possible in MacOS, they may not have everything my local machine has for the build to complete successfully 😢

I'd really appreciate some help or guidance on how to proceed. If I understand it correctly, the bazel_6 package builds correctly and what fails to build are some of the bazel-test* packages along with bazel-watcher?? 🤔

@timothyklim
Copy link
Contributor

I'd really appreciate some help or guidance on how to proceed. If I understand it correctly, the bazel_6 package builds correctly and what fails to build are some of the bazel-test* packages along with bazel-watcher?? thinking

Maybe this will help #203519

@alloveras
Copy link
Contributor Author

Maybe this will help #203519

Let's give it a go 🚀 !

@divanorama
Copy link
Contributor

for xpc.h also #207104 may be needed + maybe some more fixes as I get more failures in different places after fixing xpc.h

@alloveras
Copy link
Contributor Author

for xpc.h also #207104 may be needed + maybe some more fixes as I get more failures in different places after fixing xpc.h

It seems I've reached a point where I see similar errors to the ones you were seeing in your build. Before I go in too deep, should I look at resolving those as part of this PR or should I raise separate ones if I figure out how to address the compilation errors related to the Apple SDKs?

@layus
Copy link
Member

layus commented Jan 4, 2023

@uri-canva, may I request your assistance on this one ? To make tests work on darwin.

It looks like it is in a good shape already, and the tests failures seem harmless, but I would rather not ship this package broken on darwin.

layus
layus approved these changes Jan 4, 2023
View reviewed changes
Copy link
Member

@layus layus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alloveras Thanks for making this PR. Seems perfect on linux, and I am eager to merge it. Will just wait a bit for darwin fixes if possible.

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/build-managers/bazel/bazel_6/default.nix Outdated Show resolved Hide resolved
@uri-canva
Copy link
Contributor

I don't think this PR introduces new breakages in darwin compared to master, so I'm happy to merge it as is, and fix up the existing breakages in a separate PR. @alloveras want to accept the suggestions? Then I can merge.

@uri-canva uri-canva merged commit 4001c32 into NixOS:master Jan 10, 2023
@github-actions github-actions bot mentioned this pull request Jan 10, 2023
Closed
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #210121 for release-22.11.

@zowoq zowoq mentioned this pull request Jan 11, 2023
Merged
@zowoq
Copy link
Contributor

zowoq commented Jan 11, 2023 •
edited
Loading

This causes a mass rebuild on darwin so I'm reverting it. #210129

~23000 rebuilds across x86 and aarch64 darwin: https://gist.github.com/GrahamcOfBorg/7e0240eab852691d7fe699cca63da5e1

zowoq
zowoq reviewed Jan 11, 2023
View reviewed changes
pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix
@@ -159,7 +159,7 @@
ScreenSaver = {};
ScreenTime = {};
ScriptingBridge = {};
Security = { inherit IOKit libDER; };
Security = { inherit IOKit libDER xpc; };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to go through staging.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will create a separate PR for this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh there already is one: #207123

@uri-canva
Copy link
Contributor

Thank you! Does the revert need to be backported too, or are mass rebuilds not an issue on the release branches?

@zowoq
Copy link
Contributor

zowoq commented Jan 11, 2023

Does the revert need to be backported too

No it doesn't been to be backported as the backport of this PR (#210121) hasn't been merged yet.

@alloveras alloveras deleted the patch-2 branch January 13, 2023 05:49
@uri-canva uri-canva mentioned this pull request Jan 17, 2023
Merged
13 tasks
@uri-canva
Copy link
Contributor

Reopened as #211292, without the sdk or buildBazelPackage changes.

@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zowoq zowoq zowoq left review comments

@layus layus layus approved these changes

@raphaelr raphaelr raphaelr left review comments

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

@avdv avdv Awaiting requested review from avdv

@groodt groodt Awaiting requested review from groodt

@mboes mboes Awaiting requested review from mboes

@aherrmann aherrmann Awaiting requested review from aherrmann

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

@marsam marsam Awaiting requested review from marsam

@ylecornec ylecornec Awaiting requested review from ylecornec

@olebedev olebedev Awaiting requested review from olebedev

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@alloveras @timothyklim @divanorama @layus @uri-canva @zowoq @raphaelr @olebedev @Janik-Haag