swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212190 from helsinki-systems/mariadb_105_ossl3

Browse source 
mariadb_1010: init at 10.10.2
This commit is contained in:
ajs124 2023-02-08 15:53:02 +01:00 committed by GitHub
parent 80e9706f5f 3f5fcc6eab
commit 69de4ddc4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/servers/sql/mariadb/default.nix
View file

@ -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;
};
}

1
pkgs/top-level/all-packages.nix
View file

@ -24872,6 +24872,7 @@ with pkgs;
mariadb_106
mariadb_108
mariadb_109
mariadb_1010
;
mariadb = mariadb_106;
mariadb-embedded = mariadb.override { withEmbedded = true; };