diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
commit | 551fec44673ea023c303335e762f880d3c28646e (patch) | |
tree | 4d726dc291badc45899c225e36f5315ef7f938ee /nixos/doc | |
parent | 3f889f30bee92c3f2d5eaf53e56aef68f61efc4a (diff) | |
parent | 291de70ed6b736285ae4de6e3e556c0fc86c2348 (diff) | |
download | nixlib-551fec44673ea023c303335e762f880d3c28646e.tar nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.gz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.bz2 nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.lz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.xz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.zst nixlib-551fec44673ea023c303335e762f880d3c28646e.zip |
Merge branch 'master' into es6
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/configuration/adding-custom-packages.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/configuration/x-windows.xml | 1 | ||||
-rw-r--r-- | nixos/doc/manual/development/sources.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/manual.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 55 |
6 files changed, 64 insertions, 9 deletions
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index b59287a622e6..028a94275345 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -14,7 +14,7 @@ xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs: <screen> -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs </screen> Then you write and test the package as described in the Nixpkgs manual. diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 9a0969ad6355..948b35209b79 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -26,6 +26,7 @@ <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true; <xref linkend="opt-services.xserver.desktopManager.gnome3.enable"/> = true; +<xref linkend="opt-services.xserver.desktopManager.mate.enable"/> = true; <xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true; <xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true; <xref linkend="opt-services.xserver.windowManager.icewm.enable"/> = true; diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index c7b64cb84beb..eec9b56b1c07 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -11,9 +11,9 @@ modify NixOS, however, you should check out the latest sources from Git. This is as follows: <screen> -$ git clone git://github.com/NixOS/nixpkgs.git +$ git clone https://github.com/NixOS/nixpkgs $ cd nixpkgs -$ git remote add channels git://github.com/NixOS/nixpkgs-channels.git +$ git remote add channels https://github.com/NixOS/nixpkgs-channels $ git remote update channels </screen> This will check out the latest Nixpkgs sources to diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 6066d025adbf..6f8e0f613b19 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -326,10 +326,9 @@ Retype new UNIX password: *** </screen> <note> <para> - To prevent the password prompt, set - <code><xref linkend="opt-users.mutableUsers"/> = false;</code> in - <filename>configuration.nix</filename>, which allows unattended - installation necessary in automation. + For unattended installations, it is possible to use + <command>nixos-install --no-root-passwd</command> + in order to disable the password prompt entirely. </para> </note> </para> diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 61b21203f500..e9338efbc025 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -17,8 +17,8 @@ <para> If you encounter problems, please report them on the <literal - xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel</literal> - mailing list or on the <link + xlink:href="https://discourse.nixos.org">Discourse</literal> + or on the <link xlink:href="irc://irc.freenode.net/#nixos"> <literal>#nixos</literal> channel on Freenode</link>. Bugs should be reported in diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index b6514f41c017..8ee2a5f16238 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -75,12 +75,42 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> <para> + The <varname>services.cassandra</varname> module has been reworked and + was rewritten from scratch. The service has succeeding tests for + the versions 2.1, 2.2, 3.0 and 3.11 of <link + xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>. + </para> + </listitem> + <listitem> + <para> + There is a new <varname>services.foundationdb</varname> module for deploying + <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters. + </para> + </listitem> + <listitem> + <para> When enabled the <literal>iproute2</literal> will copy the files expected by ip route (e.g., <filename>rt_tables</filename>) in <filename>/run/iproute2</filename>. This allows to write aliases for routing tables for instance. </para> </listitem> + <listitem> + <para> + <varname>services.strongswan-swanctl</varname> + is a modern replacement for <varname>services.strongswan</varname>. + You can use either one of them to setup IPsec VPNs but not both at the same time. + </para> + <para> + <varname>services.strongswan-swanctl</varname> uses the + <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link> + command which uses the modern + <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link> + <emphasis>Versatile IKE Configuration Interface</emphasis>. + The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy + <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>. + </para> + </listitem> </itemizedlist> </section> @@ -99,6 +129,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <itemizedlist> <listitem> <para> + The deprecated <varname>services.cassandra</varname> module has + seen a complete rewrite. (See above.) + </para> + </listitem> + <listitem> + <para> <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead. </para> @@ -187,6 +223,16 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' <varname>kibana-oss</varname>. </para> </listitem> + <listitem> + <para> + Options + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal> + <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal> + were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at + a time anyway, hence those options never had any effect. You should be able to remove them + from your config without any issues. + </para> + </listitem> </itemizedlist> </section> @@ -265,6 +311,8 @@ inherit (pkgs.nixos { <literal>lib.traceCallXml</literal> has been deprecated. Please complain if you use the function regularly. </para> + </listitem> + <listitem> <para> The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of <literal>lib.version</literal>. Please refer to the discussion in @@ -274,6 +322,13 @@ inherit (pkgs.nixos { </listitem> <listitem> <para> + <literal>lib.recursiveUpdateUntil</literal> was not acting according to its + specification. It has been fixed to act according to the docstring, and a + test has been added. + </para> + </listitem> + <listitem> + <para> The module for <option>security.dhparams</option> has two new options now: </para> <variablelist> |