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: b66fb91f1705
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7dab61dfbf33
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 21, 2019

  1. libproxy: only wrap when pxgsettings exists 

    https://hydra.nixos.org/build/100220165
(cherry picked from commit 60c6244)
    @matthewbauer
    matthewbauer committed Sep 21, 2019
    Copy the full SHA
    b0b2dad View commit details
    Browse the repository at this point in the history

  2. mariadb: disable auth_pam plugin on darwin 

    Fixes #69034

This plugin doesn’t work right for us now, needs to be disabled. It
was added first in 10.3.18:

MariaDB/server@91fdb93#diff-7cea40646c6b8df9a67a3eac4eec9bc6
(cherry picked from commit 7e43b4d)
    @matthewbauer
    matthewbauer committed Sep 21, 2019
    Copy the full SHA
    7dab61d View commit details
    Browse the repository at this point in the history