nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 17:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/manual: fix build

Browse Source 
This broke in https://github.com/NixOS/nixpkgs/pull/86376

Also, fix some stray trailing whitespaces
This commit is contained in:
Florian Klink 2020-05-14 18:17:50 +02:00
parent 9ec8205e78
commit 6f4f37d655
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -73,7 +73,7 @@
MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more
intuitive. See <link xlink:href="https://mariadb.com/kb/en/authentication-from-mariadb-104/">Authentication from MariaDB 10.4</link>. intuitive. See <link xlink:href="https://mariadb.com/kb/en/authentication-from-mariadb-104/">Authentication from MariaDB 10.4</link>.
unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are
created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use
the traditional mysql_native_password plugin method, one must run the following: the traditional mysql_native_password plugin method, one must run the following:
<programlisting> <programlisting>
services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
@ -124,7 +124,6 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
<para> <para>
The go-modules builder now uses vendorSha256 instead of modSha256 to pin The go-modules builder now uses vendorSha256 instead of modSha256 to pin
fetched version data. This is currently a warning, but will be removed in the next release. fetched version data. This is currently a warning, but will be removed in the next release.
</programlisting>
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
@ -218,13 +217,13 @@ environment.systemPackages = [
customizable to your liking by using customizable to your liking by using
<literal>php.withExtensions</literal> or <literal>php.withExtensions</literal> or
<literal>php.buildEnv</literal> instead of writing config files <literal>php.buildEnv</literal> instead of writing config files
or changing configure flags. or changing configure flags.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
The remaining configuration flags can now be set directly on The remaining configuration flags can now be set directly on
the <literal>php</literal> attribute. For example, instead of the <literal>php</literal> attribute. For example, instead of
<programlisting> <programlisting>
php.override { php.override {