Skip to content

bazel, bazel_7: move to pkgs/by-name/ba/#375056

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
boltzmannrain:bazel_pkgs_by_name
Sep 6, 2025
Merged

bazel, bazel_7: move to pkgs/by-name/ba/#375056
philiptaron merged 1 commit intoNixOS:masterfrom
boltzmannrain:bazel_pkgs_by_name

Conversation

@boltzmannrain
Copy link
Contributor

@boltzmannrain boltzmannrain commented Jan 19, 2025

Mostly a pure move keeping pkgs/top-level darwin overrides.
Shared files from pkgs/development/tools/build-managers/bazel/ are copied to each bazel_{version] that uses them instead of figuring out the way to keep sharing. Patch sharing is of limited value, tests sharing looks more reasonable but bazel_7 (or upcoming bazel_8) doesn't use those tests and a new test setup would need to be implemented anyway.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@github-actions github-actions bot added the 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions label Jan 19, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 19, 2025
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 16, 2025
@wolfgangwalther
Copy link
Contributor

big merge conflicts, probably needs to be re-done.

@boltzmannrain
Copy link
Contributor Author

Rebased, conflicts were not very bazel-specific

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 27, 2025
@wolfgangwalther wolfgangwalther removed the 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions label May 11, 2025
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 17, 2025
@phanirithvij
Copy link
Member

bazel_5 and 6 are no more and othe merge conflicts.

@boltzmannrain boltzmannrain force-pushed the bazel_pkgs_by_name branch 2 times, most recently from f7a0334 to a53442f Compare August 30, 2025 18:38
@boltzmannrain boltzmannrain changed the title bazel, bazel_5, bazel_6, bazel_7: move to pkgs/by-name/ba/ bazel, bazel_7: move to pkgs/by-name/ba/ Aug 30, 2025
@boltzmannrain
Copy link
Contributor Author

Rebased now 👍

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 30, 2025
@phanirithvij
Copy link
Member

I don't think we should remove the tests

@boltzmannrain
Copy link
Contributor Author

Removed files were only used by bazel 5&6 but not by bazel 7.
Can return them back as still unused code if that's preferred

@phanirithvij
Copy link
Member

phanirithvij commented Sep 4, 2025

I think removal is fine, same reasoning as per #362199, but I wonder why the tests are being neglected.

edit: more merge conflicts

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 4, 2025
@boltzmannrain
Copy link
Contributor Author

I think for bazel_7 there was enough to do to just make it build compared to 5&6, and making tests work was substantial amount of work that wasn't yet done, also possibly it could have different set of tests than 5&6 had.

@boltzmannrain
Copy link
Contributor Author

rebased to fix conflicts

@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 4, 2025

# Bazel
/pkgs/development/tools/build-managers/bazel @Profpatsch
/pkgs/by-name/ba/bazel_7 @Profpatsch
Copy link
Contributor

Choose a reason for hiding this comment

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

You can add yourself too @boltzmannrain as I see you support Bazel a lot in Nixpkgs. CC also @layus


bazel_7 = callPackage ../development/tools/build-managers/bazel/bazel_7 {
bazel_7 = callPackage ../by-name/ba/bazel_7/package.nix {
inherit (darwin) sigtool;
Copy link
Contributor

Choose a reason for hiding this comment

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

This can also be moved in this PR if you also change the package.nix code to bring these into it. bazel_self in particular is finalAttrs.finalPackage. But I will merge this without it.

@philiptaron philiptaron merged commit 15e7a89 into NixOS:master Sep 6, 2025
29 of 31 checks passed
@boltzmannrain boltzmannrain mentioned this pull request Sep 6, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants