diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-01 20:00:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-01 20:00:42 +0100 |
| commit | 810dd0f9844e56efec66bfbf82c5e0412acbcba7 (patch) | |
| tree | f2e15aca6ff36c67ba27642c111bc22b2e80ea95 /pkgs/servers/sql | |
| parent | 020e80104a4723260684c8e672ac3c5c973be88d (diff) | |
| parent | 6a5cc4f8cc34ff3cf455a8c4814e6433391bcc98 (diff) | |
| download | nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.gz nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.bz2 nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.lz nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.xz nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.tar.zst nixlib-810dd0f9844e56efec66bfbf82c5e0412acbcba7.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mysql/5.7.x.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0b2778218760..0c04f910e5bb 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + CXXFLAGS = "-fpermissive"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 78ad88bc9047..1e995537c88b 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "1.1.9"; + version = "2.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d"; }; nativeBuildInputs = [ pkgconfig ]; |