diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-30 17:16:07 -0700 |
commit | dd2de66d614e58a8b89046e2de73f2305df4b23f (patch) | |
tree | f89847bb63642613f543a44e4e270643f6c1c4b7 /pkgs/servers/sql | |
parent | 99fe4f97c55185d3f51b759cbd5f8e3ab029eadb (diff) | |
parent | a7d573f224707185c44c92b8a35eb6a7ad62c552 (diff) | |
download | nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.gz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.bz2 nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.lz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.xz nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.tar.zst nixlib-dd2de66d614e58a8b89046e2de73f2305df4b23f.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 14 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 20 |
2 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ebb37aeddc69..c758ef882696 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , openssl, pcre, boost, judy, bison, libxml2 , libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames +, fixDarwinDylibNames, cctools }: with stdenv.lib; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { (if stdenv.is64bit then snappy else null) pcre libxml2 boost judy bison libevent cracklib ] ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio systemd numactl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools ]; patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB=1" + "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" ]; # fails to find lex_token.h sometimes @@ -100,6 +101,15 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + # Fix library rpaths + # TODO: put this in the stdenv to prepare for wide usage of multi-output derivations + for file in $(grep -rl $out/lib $lib); do + install_name_tool -delete_rpath $out/lib -add_rpath $lib $file + done + + '' + '' # Fix the mysql_config sed -i $out/bin/mysql_config \ -e 's,-lz,-L${zlib}/lib -lz,g' \ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cf4519a82327..7a0ecdfd9528 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -59,33 +59,33 @@ let in { postgresql90 = common { - version = "9.0.22"; + version = "9.0.23"; psqlSchema = "9.0"; - sha256 = "19gq6axjhvlr5zlrzwnll1fbrvai4xh0nb1jki6gmmschl6v5m4l"; + sha256 = "1pnpni95r0ry112z6ycrqk5m6iw0vd4npg789czrl4qlr0cvxg1x"; }; postgresql91 = common { - version = "9.1.18"; + version = "9.1.19"; psqlSchema = "9.1"; - sha256 = "1a44hmcvfaa8j169ladsibmvjakw6maaxqkzz1ab8139cqkda9i7"; + sha256 = "1ihf9h353agsm5p2dr717dvraxvsw6j7chbn3qxdcz8la5s0bmfb"; }; postgresql92 = common { - version = "9.2.13"; + version = "9.2.14"; psqlSchema = "9.2"; - sha256 = "0i3avdr8mnvn6ldkx0hc4jmclhisb2338hzs0j2m03wck8hddjsx"; + sha256 = "0bi9zfsfhj84mnaa41ar63j9qgzsnac1wwgjhy2c6j0a68zhphjl"; }; postgresql93 = common { - version = "9.3.9"; + version = "9.3.10"; psqlSchema = "9.3"; - sha256 = "0j85j69rf54cwz5yhrhk4ca22b82990j5sqb8cr1fl9843nd0fzp"; + sha256 = "0c8mailildnqnndwpmnqf8ymxmk1qf5w5dq02hjqmydgfq7lyi75"; }; postgresql94 = common { - version = "9.4.4"; + version = "9.4.5"; psqlSchema = "9.4"; - sha256 = "04q07g209y99xzjh88y52qpvz225rxwifv8nzp3bxzfni2bdk3jk"; + sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q"; }; } |