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.

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

bazel-watcher: fix darwin build #352672

Merged
merged 1 commit into from
Nov 3, 2024
Merged

Conversation

ofalvai
Copy link
Contributor

@ofalvai ofalvai commented Oct 31, 2024

https://hydra.nixos.org/build/274346443/log/tail

ZHF: #352882

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.11 Release Notes (or backporting 23.11 and 24.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 31, 2024
@ofborg ofborg bot requested a review from kalbasit November 1, 2024 00:02
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 1, 2024
@ofalvai ofalvai added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 1, 2024
@wegank
Copy link
Member

wegank commented Nov 1, 2024

@ofborg build bazel-watcher bazel-watcher.passthru.tests

@boltzmannrain
Copy link
Contributor

To fix tests following should help

diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 70c20550ec6c..429d5a7a051d 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   subPackages = [ "cmd/ibazel" ];
 
   passthru = {
-    tests.version = testers.testVersion { package = bazel-watcher; };
+    tests.version = testers.testVersion { package = bazel-watcher; command = "ibazel version"; };
   };
 
   meta = with lib; {

@ofalvai
Copy link
Contributor Author

ofalvai commented Nov 2, 2024

@ofborg build bazel-watcher bazel-watcher.passthru.tests

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 2, 2024
@wegank wegank merged commit 19833ad into NixOS:master Nov 3, 2024
28 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants