commit 1261914a96bd3b6a4f508154eb15c3b7796b56a1 · pyrox.dev/nixpkgs

nixos/tests/mysql/common.nix

···

       3
       3
        
         mysqlPackages = {

     

       4
       4
        
           inherit (pkgs) mysql80;

     

       5
       5
        
         };

     

       6
       6
       +
         perconaPackages = {

     

       7
       7
       +
           inherit (pkgs) percona-server_8_0;

     

       8
       8
       +
         };

     

       6
       9
        
         mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";

     

       7
       10
        
       }

+6 -4

nixos/tests/mysql/mysql.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         inherit (import ./common.nix { inherit pkgs lib; }) mkTestName mariadbPackages mysqlPackages;

     

       9
       9
       +
         inherit (import ./common.nix { inherit pkgs lib; }) mkTestName mariadbPackages mysqlPackages perconaPackages;

     

       10
       10
        
       

     

       11
       11
        
         makeTest = import ./../make-test-python.nix;

     

       12
       12
        
         # Setup common users

     
···

       77
       77
        
                     };

     

       78
       78
        
                   };

     

       79
       79
        
                 };

     

       80
       80
       -
               };

     

       81
       81
       -
       

     

       82
       82
       -
             mariadb =        {

     

       83
       80
        
               };

     

       84
       81
        
           };

     

       85
       82
        
       

     
···

       147
       144
        
         // (lib.mapAttrs (_: package: makeMySQLTest {

     

       148
       145
        
           inherit package;

     

       149
       146
        
         }) mariadbPackages)

     

       147
       147
       +
         // (lib.mapAttrs (_: package: makeMySQLTest {

     

       148
       148
       +
           inherit package;

     

       149
       149
       +
           name = "percona_8_0";

     

       150
       150
       +
           hasMroonga = false; useSocketAuth = false;

     

       151
       151
       +
         }) perconaPackages)

+96

pkgs/servers/sql/percona-server/8.0.x.nix

···

       1
       1
       +
       { lib, stdenv, fetchurl, bison, cmake, pkg-config

     

       2
       2
       +
       , boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2

     

       3
       3
       +
       , numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests

     

       4
       4
       +
       # Percona-specific deps

     

       5
       5
       +
       , coreutils, cyrus_sasl, gnumake, openldap

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       +
         pname = "percona-server";

     

       10
       10
       +
         version = "8.0.34-26";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";

     

       14
       14
       +
           sha256 = "sha256-xOaXfnh/lg/TutanwGt+EmxG4UA8oTPdil2nvU3NZXQ=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         nativeBuildInputs = [ bison cmake pkg-config ]

     

       18
       18
       +
           ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ];

     

       19
       19
       +
       

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.

     

       25
       25
       +
         postPatch = ''

     

       26
       26
       +
           substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool

     

       27
       27
       +
           substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool

     

       28
       28
       +
           # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.

     

       29
       29
       +
           patchShebangs storage/rocksdb/get_rocksdb_files.sh

     

       30
       30
       +
           substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp

     

       31
       31
       +
           substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"

     

       32
       32
       +
           substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         buildInputs = [

     

       36
       36
       +
           boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib

     

       37
       37
       +
           zstd libfido2 openldap perl cyrus_sasl

     

       38
       38
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       39
       39
       +
           numactl libtirpc

     

       40
       40
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       41
       41
       +
           cctools CoreServices developer_cmds DarwinTools

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         outputs = [ "out" "static" ];

     

       45
       45
       +
       

     

       46
       46
       +
         cmakeFlags = [

     

       47
       47
       +
           # Percona-specific flags.

     

       48
       48
       +
           "-DPORTABLE=1"

     

       49
       49
       +
           "-DWITH_LDAP=system"

     

       50
       50
       +
           "-DROCKSDB_DISABLE_AVX2=1"

     

       51
       51
       +
           "-DROCKSDB_DISABLE_MARCH_NATIVE=1"

     

       52
       52
       +
       

     

       53
       53
       +
           # Flags taken from mysql package.

     

       54
       54
       +
           "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.

     

       55
       55
       +
           "-DWITH_ROUTER=OFF" # It may be packaged separately.

     

       56
       56
       +
           "-DWITH_SYSTEM_LIBS=ON"

     

       57
       57
       +
           "-DWITH_UNIT_TESTS=OFF"

     

       58
       58
       +
           "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"

     

       59
       59
       +
           "-DMYSQL_DATADIR=/var/lib/mysql"

     

       60
       60
       +
           "-DINSTALL_INFODIR=share/mysql/docs"

     

       61
       61
       +
           "-DINSTALL_MANDIR=share/man"

     

       62
       62
       +
           "-DINSTALL_PLUGINDIR=lib/mysql/plugin"

     

       63
       63
       +
           "-DINSTALL_INCLUDEDIR=include/mysql"

     

       64
       64
       +
           "-DINSTALL_DOCREADMEDIR=share/mysql"

     

       65
       65
       +
           "-DINSTALL_SUPPORTFILESDIR=share/mysql"

     

       66
       66
       +
           "-DINSTALL_MYSQLSHAREDIR=share/mysql"

     

       67
       67
       +
           "-DINSTALL_MYSQLTESTDIR="

     

       68
       68
       +
           "-DINSTALL_DOCDIR=share/mysql/docs"

     

       69
       69
       +
           "-DINSTALL_SHAREDIR=share/mysql"

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         postInstall = ''

     

       73
       73
       +
           moveToOutput "lib/*.a" $static

     

       74
       74
       +
           so=${stdenv.hostPlatform.extensions.sharedLibrary}

     

       75
       75
       +
           ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
         passthru = {

     

       79
       79
       +
           client = finalAttrs.finalPackage;

     

       80
       80
       +
           connector-c = finalAttrs.finalPackage;

     

       81
       81
       +
           server = finalAttrs.finalPackage;

     

       82
       82
       +
           mysqlVersion = lib.versions.majorMinor finalAttrs.version;

     

       83
       83
       +
           tests = nixosTests.mysql.percona-server_8_0;

     

       84
       84
       +
         };

     

       85
       85
       +
       

     

       86
       86
       +
         meta = with lib; {

     

       87
       87
       +
           homepage = "https://www.percona.com/software/mysql-database/percona-server";

     

       88
       88
       +
           description = ''

     

       89
       89
       +
             A free, fully compatible, enhanced, open source drop-in replacement for

     

       90
       90
       +
             MySQL® that provides superior performance, scalability and instrumentation.

     

       91
       91
       +
           '';

     

       92
       92
       +
           license = licenses.gpl2;

     

       93
       93
       +
           maintainers = teams.flyingcircus.members;

     

       94
       94
       +
           platforms = platforms.unix;

     

       95
       95
       +
         };

     

       96
       96
       +
       })

+24

pkgs/servers/sql/percona-server/no-force-outline-atomics.patch

···

       1
       1
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       2
       +
       index 727d66011f9..acae1aada57 100644

     

       3
       3
       +
       --- a/CMakeLists.txt

     

       4
       4
       +
       +++ b/CMakeLists.txt

     

       5
       5
       +
       @@ -1338,19 +1338,6 @@ IF(UNIX AND MY_COMPILER_IS_GNU_OR_CLANG

     

       6
       6
       +
          ENDIF()

     

       7
       7
       +
        ENDIF()

     

       8
       8
       +
        

     

       9
       9
       +
       -# For aarch64 some sub-architectures support LSE atomics and some don't. Thus,

     

       10
       10
       +
       -# compiling for the common denominator (-march=armv8-a) means LSE is not used.

     

       11
       11
       +
       -# The -moutline-atomics switch enables run-time detection of LSE support.

     

       12
       12
       +
       -# There are compilers (gcc 9.3.1 for example) which support this switch, but

     

       13
       13
       +
       -# do not enable it by default, even though it seems to help. So, we force it.

     

       14
       14
       +
       -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")

     

       15
       15
       +
       -  MY_CHECK_CXX_COMPILER_FLAG( "-moutline-atomics" HAVE_OUTLINE_ATOMICS)

     

       16
       16
       +
       -  IF(HAVE_OUTLINE_ATOMICS)

     

       17
       17
       +
       -    STRING_APPEND(CMAKE_C_FLAGS   " -moutline-atomics")

     

       18
       18
       +
       -    STRING_APPEND(CMAKE_CXX_FLAGS " -moutline-atomics")

     

       19
       19
       +
       -  ENDIF()

     

       20
       20
       +
       -ENDIF()

     

       21
       21
       +
       -

     

       22
       22
       +
        IF(LINUX)

     

       23
       23
       +
          OPTION(LINK_RANDOMIZE "Randomize the order of all symbols in the binary" OFF)

     

       24
       24
       +
          SET(LINK_RANDOMIZE_SEED "mysql"

pkgs/top-level/all-packages.nix

···

       11862
       11862
        
       

     

       11863
       11863
        
         perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };

     

       11864
       11864
        
       

     

       11865
       11865
       +
         percona-server_8_0 = callPackage ../servers/sql/percona-server/8.0.x.nix {

     

       11866
       11866
       +
           inherit (darwin) cctools developer_cmds DarwinTools;

     

       11867
       11867
       +
           inherit (darwin.apple_sdk.frameworks) CoreServices;

     

       11868
       11868
       +
           boost = boost177; # Configure checks for specific version.

     

       11869
       11869
       +
           icu = icu69;

     

       11870
       11870
       +
           protobuf = protobuf3_21;

     

       11871
       11871
       +
         };

     

       11865
       11872
        
         percona-xtrabackup = percona-xtrabackup_8_0;

     

       11866
       11873
        
         percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix {

     

       11867
       11874
        
           boost = boost177;