diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-30 20:35:15 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-30 20:35:15 +0100 |
commit | 1d196d99be8f9122e201f3bff0b87b8f1c4d4248 (patch) | |
tree | 5a701a9fa63398165678228684a5a28b5a6886f4 /nixos/doc | |
parent | 50744a279ca9e7985f30ece576c0670b45d197bd (diff) | |
parent | 0e0d20fb5facbaafe04d7b96cff7bab174375e5c (diff) | |
download | nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar.gz nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar.bz2 nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar.lz nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar.xz nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.tar.zst nixlib-1d196d99be8f9122e201f3bff0b87b8f1c4d4248.zip |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/administration/declarative-containers.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/configuration/config-file.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 5 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1903.xml | 24 |
4 files changed, 32 insertions, 3 deletions
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 2a98fb126231..d03dbc4d7055 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,7 +15,7 @@ containers.database = { config = { config, pkgs, ... }: { <xref linkend="opt-services.postgresql.enable"/> = true; - <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96; + <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_6; }; }; </programlisting> diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 8a1a39c98c10..c77cfe137baa 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; pkgs.emacs ]; -<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql90; +<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10; </programlisting> The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 9.0. For more information on packages, + by NixOS’s PostgreSQL service to 10.x. For more information on packages, including how to add new ones, see <xref linkend="sec-custom-packages"/>. </para> </listitem> diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 0ddf40acbfcc..8715a05f508b 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -637,6 +637,11 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' anyways for clarity. </para> </listitem> + <listitem> + <para> + Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 77f58b224d7f..7cfe1d27a4ff 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -139,6 +139,21 @@ make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal> </para> </listitem> + <listitem> + <para> + OpenSMTPD has been upgraded to version 6.4.0p1. This release makes + backwards-incompatible changes to the configuration file format. See + <command>man smtpd.conf</command> for more information on the new file + format. + </para> + </listitem> + <listitem> + <para> + The versioned <varname>postgresql</varname> have been renamed to use + underscore number seperators. For example, <varname>postgresql96</varname> + has been renamed to <varname>postgresql_9_6</varname>. + </para> + </listitem> </itemizedlist> </section> @@ -157,6 +172,15 @@ Matomo version. </para> </listitem> + <listitem> + <para> + The deprecated <literal>truecrypt</literal> package has been removed + and <literal>truecrypt</literal> attribute is now an alias for + <literal>veracrypt</literal>. VeraCrypt is backward-compatible with + TrueCrypt volumes. Note that <literal>cryptsetup</literal> also + supports loading TrueCrypt volumes. + </para> + </listitem> </itemizedlist> </section> </section> |