JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mariadb: 10.2.7 -> 10.2.8

Browse Source
This commit is contained in:
Robin Gloster 2017-08-28 22:01:50 +02:00
parent 3e241efe9b
commit 3fcf6bf518
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/sql/mariadb/default.nix
View File

@ -15,11 +15,11 @@ mariadb = everything // {
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
version = "10.2.7"; version = "10.2.8";
src = fetchurl { 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"; 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 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2"; sha256 = "14r397rbk00647nkmbjzfcgicamgnyyqyi5ca9py51ghg7z51lld";
name = "mariadb-${version}.tar.gz"; name = "mariadb-${version}.tar.gz";
}; };
@ -29,20 +29,12 @@ common = rec { # attributes common to both builds
] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ] ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
patches = [
(fetchpatch {
url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch";
sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww";
})
];
prePatch = '' prePatch = ''
substituteInPlace cmake/libutils.cmake \ substituteInPlace cmake/libutils.cmake \
--replace /usr/bin/libtool libtool --replace /usr/bin/libtool libtool
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
''; '';
cmakeFlags = [ cmakeFlags = [
"-DBUILD_CONFIG=mysql_release" "-DBUILD_CONFIG=mysql_release"
"-DMANUFACTURER=NixOS.org" "-DMANUFACTURER=NixOS.org"