diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/servers/sql/mariadb/default.nix | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/servers/sql/mariadb/default.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/sql/mariadb/default.nix | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index cab0b70b64df..82fdc2a3a38b 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests -, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc, cracklib, systemd, perl +{ lib, stdenv, fetchurl, nixosTests +# Native buildInputs components +, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config +# Common components +, curl, libiconv, ncurses, openssl, pcre2 +, libkrb5, liburing, systemd +, CoreServices, cctools, perl +, jemalloc, less +# Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd -, fixDarwinDylibNames, cctools, CoreServices, less -, numactl # NUMA Support +, cracklib, judy, libevent, libxml2 +, linux-pam, numactl, pmdk , withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -22,24 +28,21 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.6.3"; + version = "10.6.5"; src = fetchurl { - urls = [ - "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" - "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" - ]; - sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav"; - name = "mariadb-${version}.tar.gz"; + url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; + sha256 = "sha256-4L4EBCjZpCqLtL0iG1Z/8lIs1vqJBjhic9pPA8XCCo8="; }; nativeBuildInputs = [ cmake pkg-config ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = [ - ncurses openssl zlib pcre2 libiconv curl - ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] + curl libiconv ncurses openssl pcre2 zlib + ] ++ optionals stdenv.hostPlatform.isLinux [ libkrb5 liburing systemd ] + ++ optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' @@ -47,8 +50,11 @@ common = rec { # attributes common to both builds ''; patches = [ - ./cmake-includedir.patch - ]; + ./patch/cmake-includedir.patch + ] + # Fixes a build issue as documented on + # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 + ++ lib.optional (!stdenv.isLinux) ./patch/macos-MDEV-26769-regression-fix.patch; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" @@ -95,7 +101,11 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb-config,mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -rf "$out"/share/aclocal + ''; + + # perlPackages.DBDmysql is broken on darwin + postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' + wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} ''; passthru.mysqlVersion = "5.7"; @@ -124,7 +134,7 @@ client = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; patches = common.patches ++ [ - ./cmake-plugin-includedir.patch + ./patch/cmake-plugin-includedir.patch ]; cmakeFlags = common.cmakeFlags ++ [ @@ -135,8 +145,7 @@ client = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -rf "$out"/share/doc - rm "$out"/bin/{mysqltest,mytop} + rm "$out"/bin/{mariadb-test,mysqltest} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$libmysqlclient_path" "$out"/lib/libmysqlclient${libExt} @@ -149,15 +158,16 @@ server = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev flex ]; buildInputs = common.buildInputs ++ [ bzip2 lz4 lzo snappy xz zstd - libxml2 judy libevent cracklib + cracklib judy libevent libxml2 ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] - ++ optional stdenv.hostPlatform.isLinux linux-pam - ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; + ++ optionals stdenv.hostPlatform.isLinux [ linux-pam ] + ++ optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) pmdk.dev + ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv + ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ]; patches = common.patches; @@ -199,6 +209,7 @@ server = stdenv.mkDerivation (common // { ''; postInstall = common.postInstall + '' + rm -r "$out"/share/aclocal chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} '' + optionalString withStorageMroonga '' @@ -209,11 +220,6 @@ server = stdenv.mkDerivation (common // { rm -r "$out"/OFF ''; - # perlPackages.DBDmysql is broken on darwin - postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' - wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} - ''; - CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; }); in mariadb |