Unverified Commit 01719ad6 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

mysql80: drop (#507865)

parents b28a8f0b b6fe5a9c

nixos/doc/manual/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh 


- `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated.



- `mysql80` has been removed. Please update to `mysql84` or `mariadb`. See the [upgrade guide](https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/) for more information.



- `services.prometheus.exporters.rspamd` has been removed. It relied on the Rspamd /stat endpoint via the JSON exporter. You can use the Rspamd [/metrics](https://docs.rspamd.com/developers/protocol#controller-http-endpoints) endpoint directly instead.



- The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.

nixos/modules/services/databases/mysql.nix

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ let 
  cfg = config.services.mysql;



  isMariaDB = lib.getName cfg.package == lib.getName pkgs.mariadb;

  isOracle = lib.getName cfg.package == lib.getName pkgs.mysql80;

  isOracle = lib.getName cfg.package == lib.getName pkgs.mysql84;

  # Oracle MySQL has supported "notify" service type since 8.0

  hasNotify = isMariaDB || (isOracle && lib.versionAtLeast cfg.package.version "8.0");

nixos/modules/services/web-apps/keycloak.nix

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ in 
      services.mysql.enable = mkDefault createLocalMySQL;

      services.mysql.package =

        let

          dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql80;

          dbPkg = if cfg.database.type == "mariadb" then pkgs.mariadb else pkgs.mysql84;

        in

        mkIf createLocalMySQL (mkDefault dbPkg);

    };

nixos/tests/mysql/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    import ../../../pkgs/servers/sql/mariadb pkgs

  );

  mysqlPackages = {

    inherit (pkgs) mysql80;

    inherit (pkgs) mysql84;

  };

  perconaPackages = {

    inherit (pkgs) percona-server_8_0 percona-server_8_4;

pkgs/by-name/li/libcbor/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


  # for passthru.tests

  libfido2,

  mysql80,

  mysql84,

  openssh,

  systemd,

}:
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeCheckInputs = [ cmocka ];



  passthru.tests = {

    inherit libfido2 mysql80;

    inherit libfido2 mysql84;

    openssh = (openssh.override { withFIDO = true; });

    systemd = (

      systemd.override {