Unverified Commit 00798308 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #195644: mysql57: drop

parents 0f190ab5 0d6d7a1f

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+18 −0
Original line number Diff line number Diff line
@@ -773,6 +773,24 @@ 
          due to upstream dropping support.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>mysql57</literal> has been removed. Please update to

          <literal>mysql80</literal> or <literal>mariadb</literal>. See

          the

          <link xlink:href="https://mariadb.com/kb/en/upgrading-from-mysql-to-mariadb/">upgrade

          guide</link> for more information.

        </para>

      </listitem>

      <listitem>

        <para>

          Consequently, <literal>cqrlog</literal> and

          <literal>amorok</literal> now use <literal>mariadb</literal>

          instead of <literal>mysql57</literal> for their embedded

          databases. Running <literal>mysql_upgrade</literal> may be

          neccesary.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>k3s</literal> supports <literal>clusterInit</literal>

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

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 


- `k3s` no longer supports docker as runtime due to upstream dropping support.



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



- Consequently, `cqrlog` and `amorok` now use `mariadb` instead of `mysql57` for their embedded databases. Running `mysql_upgrade` may be neccesary.

- `k3s` supports `clusterInit` option, and it is enabled by default, for servers.



- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.

nixos/tests/mysql/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;

  });

  mysqlPackages = {

    inherit (pkgs) mysql57 mysql80;

    inherit (pkgs) mysql80;

  };

  mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";

}

pkgs/applications/audio/amarok/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine

, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem

, fftw, phonon, plasma-framework, threadweaver, breeze-icons

, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras

, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras

, pmdk, numactl

}:



mkDerivation rec {
@@ -23,7 +24,7 @@ mkDerivation rec { 
    qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine

    karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem

    phonon plasma-framework threadweaver

    curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static

    curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mariadb-embedded

    pcre snappy taglib taglib_extras breeze-icons

  ];

pkgs/applications/misc/mysql-workbench/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
, dbus

, bash

, coreutils

, zstd

}:



let
@@ -129,6 +130,7 @@ in stdenv.mkDerivation rec { 
    libepoxy

    at-spi2-core

    dbus

    zstd

  ];



  postPatch = ''