diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:51:55 +0200 |
| commit | e2e3861d6b57a53fd7774a7c31d0295bbd256930 (patch) | |
| tree | f0f8fb922a439ae239d522ac79bd40d80efd234f /pkgs/servers/sql | |
| parent | a7c52c451e541514fe324bec2916758c031d3af8 (diff) | |
| parent | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (diff) | |
| download | nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.gz nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.bz2 nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.lz nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.xz nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.tar.zst nixlib-e2e3861d6b57a53fd7774a7c31d0295bbd256930.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/connector-c/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 0e0302685401..cb873f4d5a02 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DWITH_CURL=ON" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ebd9938f12f4..63ad6ce3b25a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -41,9 +41,6 @@ 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 = [ @@ -163,6 +160,8 @@ server = stdenv.mkDerivation (common // { patches = common.patches ++ [ ./cmake-without-client.patch + ] ++ optionals stdenv.isDarwin [ + ./cmake-without-plugin-auth-pam.patch ]; cmakeFlags = common.cmakeFlags ++ [ diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 7b64de381f3e..aeaff17889fc 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.4"; + version = "1.4.5"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "refs/tags/ver_${version}"; - sha256 = "0ynsmsxfkcp82ccpz2nrgg8wiil8yxqigvw6425lx8v80h5lszbw"; + sha256 = "1qsya9h4r147mkl7jzh4qk7ciyr3hj6gv7rfh4zml9zav0pjj76x"; }; installPhase = '' |