Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b66fb91f1705
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b0b2dad View commit details

  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
Showing with 4 additions and 1 deletion.
  1. +1 −1 pkgs/development/libraries/libproxy/default.nix
  2. +3 −0 pkgs/servers/sql/mariadb/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libproxy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
})
];

postFixup = ''
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
# config_gnome3 uses the helper to find GNOME proxy settings
wrapProgram $out/libexec/pxgsettings --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
'';
3 changes: 3 additions & 0 deletions pkgs/servers/sql/mariadb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,9 @@ common = rec { # attributes common to both builds

prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
'' + optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cmake/build_configurations/mysql_release.cmake \
--replace "SET(PLUGIN_AUTH_PAM YES)" ""
'';

patches = [