Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 271528b9345c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b6ef10f6a81d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 19, 2020

  1. mariadb: fix darwin build 

    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 #70835

(cherry picked from commit b0b0bb7)
    @callahad @veprbl
    callahad authored and veprbl committed Feb 19, 2020
    Copy the full SHA
    1ddda1c View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Merge pull request #80571 from veprbl/pr/mariadb_darwin_fix_19.09 

    [19.09] mariadb: fix darwin build
    @veprbl
    veprbl committed Feb 20, 2020
    Copy the full SHA
    b6ef10f View commit details
    Browse the repository at this point in the history