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

bonnie: Update Darwin patch #24826

Merged
merged 1 commit into from Apr 12, 2017
Merged

bonnie: Update Darwin patch #24826

merged 1 commit into from Apr 12, 2017

Conversation

kirelagin
Copy link
Member

@copumpkin
Copy link
Member

Looks good! I guess I accidentally pushed my fix to the wrong branch and now we'll have a merge conflict when we merge staging to master, but this is better.

@@ -1,3 +1,6 @@
Derivied from a patch distributed with a Homebrew formula.
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps a link to the upstream patch?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, let’s do that.

@kirelagin
Copy link
Member Author

There will be no conflict in default.nix, someone has to watch for this.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Apr 11, 2017
@LnL7 LnL7 merged commit ce4c9c4 into NixOS:master Apr 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants