diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2023-02-08 15:53:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 15:53:02 +0100 |
| commit | 69de4ddc4b722701a6ba3fff70c537750eb250b3 (patch) | |
| tree | 141b9df72c2800ad097f29d5390d71b3fa5a7b7f | |
| parent | 80e9706f5fade7c0aac74f41700cd78a7483193a (diff) | |
| parent | 3f5fcc6eab9f05e374e8f93869d9d8ddff252ba0 (diff) | |
Merge pull request #212190 from helsinki-systems/mariadb_105_ossl3
mariadb_1010: init at 10.10.2
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9eacea78a37eb..fe3e3fba8d2a4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3cbcfee7e49f..24181c4241470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24872,6 +24872,7 @@ with pkgs; mariadb_106 mariadb_108 mariadb_109 + mariadb_1010 ; mariadb = mariadb_106; mariadb-embedded = mariadb.override { withEmbedded = true; }; |