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

mariadb: updates
This commit is contained in:
Robert Scott 2023-11-19 12:31:48 +00:00 committed by GitHub
commit 0fd0ff80ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 16 deletions

View file

@ -245,36 +245,29 @@ in
# see https://mariadb.org/about/#maintenance-policy for EOLs # see https://mariadb.org/about/#maintenance-policy for EOLs
mariadb_105 = self.callPackage generic { mariadb_105 = self.callPackage generic {
# Supported until 2025-06-24 # Supported until 2025-06-24
version = "10.5.22"; version = "10.5.23";
hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4=";
inherit (self.darwin) cctools; inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_106 = self.callPackage generic { mariadb_106 = self.callPackage generic {
# Supported until 2026-07-06 # Supported until 2026-07-06
version = "10.6.15"; version = "10.6.16";
hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_1010 = self.callPackage generic {
# Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff
version = "10.10.6";
hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU=";
inherit (self.darwin) cctools; inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_1011 = self.callPackage generic { mariadb_1011 = self.callPackage generic {
# Supported until 2028-02-16 # Supported until 2028-02-16
version = "10.11.5"; version = "10.11.6";
hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc=";
inherit (self.darwin) cctools; inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };
mariadb_110 = self.callPackage generic { mariadb_110 = self.callPackage generic {
# Supported until 2024-06-07 # Supported until 2024-06-07
version = "11.0.3"; version = "11.0.4";
hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms=";
inherit (self.darwin) cctools; inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices; inherit (self.darwin.apple_sdk.frameworks) CoreServices;
}; };

View file

@ -567,6 +567,7 @@ mapAliases ({
MACS2 = macs2; # Added 2023-06-12 MACS2 = macs2; # Added 2023-06-12
mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11
mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14
mariadb-client = hiPrio mariadb.client; #added 2019.07.28 mariadb-client = hiPrio mariadb.client; #added 2019.07.28
markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22
markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12

View file

@ -26912,7 +26912,6 @@ with pkgs;
inherit (import ../servers/sql/mariadb pkgs) inherit (import ../servers/sql/mariadb pkgs)
mariadb_105 mariadb_105
mariadb_106 mariadb_106
mariadb_1010
mariadb_1011 mariadb_1011
mariadb_110 mariadb_110
; ;