Skip to content

bear: fix on x86_64-darwin#135989

Merged
domenkozar merged 1 commit intoNixOS:masterfrom
veprbl:pr/bear_darwin_fix
Aug 28, 2021
Merged

bear: fix on x86_64-darwin#135989
domenkozar merged 1 commit intoNixOS:masterfrom
veprbl:pr/bear_darwin_fix

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Aug 28, 2021

Motivation for this change
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@github-actions
Copy link
Contributor

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

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-135989-to-release-21.05 origin/release-21.05
cd .worktree/backport-135989-to-release-21.05
git checkout -b backport-135989-to-release-21.05
ancref=$(git merge-base c0c88243ee64e4fd5bbedf3c79f411f0b942880c e2e44d9b5c6bf84b89d2f5bb7145e95923aa43f4)
git cherry-pick -x $ancref..e2e44d9b5c6bf84b89d2f5bb7145e95923aa43f4

@github-actions
Copy link
Contributor

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

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-135989-to-release-21.05 origin/release-21.05
cd .worktree/backport-135989-to-release-21.05
git checkout -b backport-135989-to-release-21.05
ancref=$(git merge-base c0c88243ee64e4fd5bbedf3c79f411f0b942880c e2e44d9b5c6bf84b89d2f5bb7145e95923aa43f4)
git cherry-pick -x $ancref..e2e44d9b5c6bf84b89d2f5bb7145e95923aa43f4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants