Skip to content

cargo-watch: fix build on darwin#269720

Merged
delroth merged 1 commit intoNixOS:masterfrom
szlend:fix-cargo-watch-darwin
Nov 25, 2023
Merged

cargo-watch: fix build on darwin#269720
delroth merged 1 commit intoNixOS:masterfrom
szlend:fix-cargo-watch-darwin

Conversation

@szlend
Copy link
Member

@szlend szlend commented Nov 24, 2023

Description of changes

Fixes #269660
Borrowed fix from #195604

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/)
  • 23.11 Release Notes (or backporting 23.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.

Priorities

Add a 👍 reaction to pull requests you find important.

@szlend
Copy link
Member Author

szlend commented Nov 24, 2023

Please tag for 23.11 backport if approved.

@szlend szlend added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 24, 2023
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 24, 2023
@ofborg ofborg bot requested review from ivan and matthiasbeyer November 24, 2023 22:47
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 24, 2023
@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Nov 25, 2023
@matthiasbeyer
Copy link
Contributor

@ofborg build cargo-watch

@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Nov 25, 2023
@delroth delroth merged commit 55103bf into NixOS:master Nov 25, 2023
@github-actions
Copy link
Contributor

Backport failed for release-23.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.05
git worktree add -d .worktree/backport-269720-to-release-23.05 origin/release-23.05
cd .worktree/backport-269720-to-release-23.05
git switch --create backport-269720-to-release-23.05
git cherry-pick -x c4e7af7473e7ca28dacb9bc89da9587eb469728d

@github-actions
Copy link
Contributor

Successfully created backport PR for release-23.11:

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 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure: cargo-watch (x86-64-darwin)

4 participants