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.

Sign up for GitHub

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

Jump to bottom

mariadb: fix builds on darwin #70841

Merged
merged 1 commit into from
Oct 11, 2019
Merged

mariadb: fix builds on darwin #70841

merged 1 commit into from
Oct 11, 2019
+2 −3

Conversation

callahad
Copy link
Member

@callahad callahad commented Oct 9, 2019

Fixes #70835

We want to disable PLUGIN_AUTH_PAM when building:

  1. mariadb on macOS.
  2. mariadb-client on any platform

Unfortunately, the interaction of these two commits, 6c97b04 and 7e43b4d, created a situation where we disable it twice when building on macOS: Once in a darwin-specific prePatch script, and again in the patches section for client builds.

(See L42-47 and L124-127 in the parent commit)

This removes the redundant prePatch script and conditionally applies the patch to mariadb server builds on darwin.

Motivation for this change
  • Both mariadb and mariadb-client stopped building on macOS.
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @thoughtpolice

Sorry, something went wrong.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 9, 2019
@ofborg ofborg bot requested a review from thoughtpolice October 9, 2019 09:15
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 9, 2019
veprbl
veprbl reviewed Oct 9, 2019
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Passes nix-review on x86_64-darwin

1 package are marked as broken and were skipped:
zoneminder

6 package were build:
diesel-cli lua51Packages.luadbi-mysql luaPackages.luadbi-mysql lua53Packages.luadbi-mysql luajitPackages.luadbi-mysql mysql

@veprbl
Copy link
Member

veprbl commented Oct 9, 2019

cc @Izorkin @matthewbauer

@Izorkin
Copy link
Contributor

Izorkin commented Oct 9, 2019

Thanks for fix.

@callahad callahad mentioned this pull request Oct 9, 2019
Closed
10 tasks
@jonringer
Copy link
Contributor

@GrahamcOfBorg build mariadb

@jonringer
Copy link
Contributor

jonringer commented Oct 9, 2019 •
edited
Loading

do you mind changing the commit message to

mariadb: fix darwin build

https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

@callahad
mariadb: fix darwin build

Verified

This commit was signed with the committer’s verified signature. The key has expired.
callahad Dan Callahan
GPG key ID: 8D6DD713E9EBA7FD
Expired
Verified
Learn about vigilant mode
b0b0bb7 
We want to disable `PLUGIN_AUTH_PAM` when building:

1. `mariadb` on macOS.
2. `mariadb-client` on any platform

Unfortunately, the interaction of these two commits
  6c97b04
  7e43b4d
created a situation where we disable it *twice* when building on macOS.
Once in a darwin-specific `prePatch` script, and again in the `patches`
section for client builds.

This removes the redundant `prePatch` script and conditionally applies
the patch to `mariadb` server builds on darwin.

Fixes NixOS#70835
@callahad
Copy link
Member Author

callahad commented Oct 9, 2019

do you mind changing the commit message

Doh! Done :)

@jonringer would you mind kicking ofborg again for me? :)

@Izorkin
Copy link
Contributor

Izorkin commented Oct 9, 2019

@GrahamcOfBorg build mariadb mariadb-client

@veprbl veprbl merged commit 1f9882c into NixOS:master Oct 11, 2019
@callahad callahad deleted the mariadb branch October 11, 2019 07:55
@ryota-ka
Copy link
Contributor

Won't this be backported to nixpkgs-19.09-darwin?

@veprbl veprbl mentioned this pull request Feb 19, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor

release-19.09 would be the right target channel, I think nixpkgs-19.09-darwin is a "release channel" which reflects what nix-channel is looking for.

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

@veprbl veprbl

@thoughtpolice thoughtpolice

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

mariadb and mariadb-client fail on darwin due to redundant patches
5 participants
@callahad @veprbl @Izorkin @jonringer @ryota-ka