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

Merge pull request #236436 from helsinki-systems/mariadb_changes

Browse source 
mariadb: init at 11.0.2 + upgrade default from 10.6 to 10.11
This commit is contained in:
Pol Dellaiera 2023-06-07 20:31:10 +02:00 committed by GitHub
commit 27c6a99b9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -24,6 +24,8 @@
- `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`.
- `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues.
- `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.

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

@ -270,10 +270,17 @@ in
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. TODO: make this the default, at some point # Supported until 2028-02-16
version = "10.11.3"; version = "10.11.3";
hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc="; hash = "sha256-sGWw8ypun9R55Wb9ZnFFA3mIbY3aLZp++TCvHlwmwMc=";
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 {
# Supported until 2024-06-07
version = "11.0.2";
hash = "sha256-PHFXbK0OpBaIInDjg/lMyJaTt/vM4fpPMG/j6THkZK4=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
} }

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

@ -25985,8 +25985,9 @@ with pkgs;
mariadb_106 mariadb_106
mariadb_1010 mariadb_1010
mariadb_1011 mariadb_1011
mariadb_110
; ;
mariadb = mariadb_106; mariadb = mariadb_1011;
mariadb-embedded = mariadb.override { withEmbedded = true; }; mariadb-embedded = mariadb.override { withEmbedded = true; };
mongodb = hiPrio mongodb-6_0; mongodb = hiPrio mongodb-6_0;