Unverified Commit 69de4ddc authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #212190 from helsinki-systems/mariadb_105_ossl3 

mariadb_1010: init at 10.10.2
parents 80e9706f 3f5fcc6e

pkgs/servers/sql/mariadb/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ let 
        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]

        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ jemalloc ]

        ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])

        ++ (if (lib.versionOlder version "10.6")

        ++ (if (lib.versionOlder version "10.5")

            then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]

            else [ openssl curl ]);
@@ -274,4 +274,11 @@ in 
      inherit (self.darwin) cctools;

      inherit (self.darwin.apple_sdk.frameworks) CoreServices;

    };

    mariadb_1010 = self.callPackage generic {

      # Supported until 2023-11

      version = "10.10.2";

      hash = "sha256-V8vQESsitZL2V81OuC4vNq2QE1Exe/jheElXjoA/PLI=";

      inherit (self.darwin) cctools;

      inherit (self.darwin.apple_sdk.frameworks) CoreServices;

    };

  }

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -24872,6 +24872,7 @@ with pkgs; 
    mariadb_106

    mariadb_108

    mariadb_109

    mariadb_1010

  ;

  mariadb = mariadb_106;

  mariadb-embedded = mariadb.override { withEmbedded = true; };