diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-29 23:34:16 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-12-29 02:18:35 +0100 |
| commit | 5672ca2d0be758cc39867d729b3c4a2b25ea67a8 (patch) | |
| tree | 81f2b2b588b9a7671e9bfac133ca582505e57d8e /pkgs/servers/sql | |
| parent | 77af1d2000dc4c169f10823d5991f658170cd8fd (diff) | |
| download | nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar.gz nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar.bz2 nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar.lz nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar.xz nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.tar.zst nixlib-5672ca2d0be758cc39867d729b3c4a2b25ea67a8.zip | |
mariadb: 10.2.6 -> 10.2.7
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index a73c870f5395..1eaf6c4e32eb 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,26 +15,33 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.6"; + version = "10.2.7"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; - sha256 = "1rd2b1b6s87ymr5qhlggr4q4ljazv82ih0msgrbz1rfn81pcg1f3"; + sha256 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2"; name = "mariadb-${version}.tar.gz"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + ncurses openssl zlib pcre jemalloc + ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + + patches = [ + (fetchpatch { + url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch"; + sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww"; + }) + ]; + prePatch = '' substituteInPlace cmake/libutils.cmake \ --replace /usr/bin/libtool libtool sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ - ncurses openssl zlib pcre jemalloc - ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" |