cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #191960 from helsinki-systems/upd/mariadb

Browse source 
mariadb: patch releases
This commit is contained in:
Lassulus 2022-09-21 21:38:03 +02:00 committed by GitHub
commit e8900a7bc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]) ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])
++ (if (lib.versionOlder version "10.8") ++ (if (lib.versionOlder version "10.6")
then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ] then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]
else [ openssl curl ]); else [ openssl curl ]);
@ -252,22 +252,22 @@ in {
}; };
mariadb_106 = mariadbPackage { mariadb_106 = mariadbPackage {
# Supported until 2026-07 # Supported until 2026-07
version = "10.6.9"; version = "10.6.10";
hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c=";
}; };
mariadb_107 = mariadbPackage { mariadb_107 = mariadbPackage {
# Supported until 2023-02. TODO: remove ahead of 22.11 release. # Supported until 2023-02. TODO: remove ahead of 22.11 release.
version = "10.7.5"; version = "10.7.6";
hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; hash = "sha256-erX7pDmQV33BdPG5a9NAszN8G9Rv48NmIgsJ0siNLqA=";
}; };
mariadb_108 = mariadbPackage { mariadb_108 = mariadbPackage {
# Supported until 2023-05 # Supported until 2023-05
version = "10.8.4"; version = "10.8.5";
hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos=";
}; };
mariadb_109 = mariadbPackage { mariadb_109 = mariadbPackage {
# Supported until 2023-08(?) # Supported until 2023-08(?)
version = "10.9.2"; version = "10.9.3";
hash = "sha256-X0X/deBDlmVVqV+9uPCS5gzipsR7pZ0UTbRuE46SL0g="; hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=";
}; };
} }