diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /nixos/doc | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) |
Merge branch 'master' into closure-size
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/installation/installing-usb.xml | 16 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1603.xml | 61 |
3 files changed, 68 insertions, 13 deletions
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 5def6e8753fe..a4b5dafbed16 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -7,10 +7,18 @@ <title>Booting from a USB Drive</title> <para>For systems without CD drive, the NixOS live CD can be booted from -a USB stick. For non-UEFI installations, -<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link> -will work. For UEFI installations, you should mount the ISO, copy its contents -verbatim to your drive, then either: +a USB stick. You can use the <command>dd</command> utility to write the image: +<command>dd if=<replaceable>path-to-image</replaceable> +of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the +correct drive; you can use the <command>lsblk</command> command to get a list of +block devices.</para> + +<para>The <command>dd</command> utility will write the image verbatim to the drive, +making it the recommended option for both UEFI and non-UEFI installations. For +non-UEFI installations, you can alternatively use +<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If you +cannot use <command>dd</command> for a UEFI installation, you can also mount the +ISO, copy its contents verbatim to your drive, then either: <itemizedlist> <listitem> diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 7e71df28cdb3..4a0b3fee7c18 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -157,10 +157,6 @@ $ nano /mnt/etc/nixos/configuration.nix <command>nixos-generate-config</command> will figure out the required modules.</para></note> - <para>Examples of real-world NixOS configuration files can be - found at <link - xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para> - </listitem> <listitem><para>Do the installation: diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 8119470385f6..1528c8a72463 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-16.03"> -<title>Release 16.03 (“Emu”, 2016/03/??)</title> +<title>Release 16.03 (“Emu”, 2016/03/31)</title> <para>In addition to numerous new and upgraded packages, this release has the following highlights:</para> @@ -34,6 +34,10 @@ has the following highlights:</para> </listitem> <listitem> + <para>Binutils 2.26 (was 2.23.1). See #909</para> + </listitem> + + <listitem> <para>Improved support for ensuring <link xlink:href="https://reproducible-builds.org/">bitwise reproducible builds</link>. For example, <literal>stdenv</literal> now sets the @@ -58,10 +62,57 @@ has the following highlights:</para> <itemizedlist> <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem> + <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/fcitx.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/ibus.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/nabi.nix</literal></para></listitem> + <listitem><para><literal>i18n/inputMethod/uim.nix</literal></para></listitem> + <listitem><para><literal>programs/fish.nix</literal></para></listitem> + <listitem><para><literal>security/acme.nix</literal></para></listitem> + <listitem><para><literal>security/audit.nix</literal></para></listitem> + <listitem><para><literal>security/oath.nix</literal></para></listitem> + <listitem><para><literal>services/hardware/irqbalance.nix</literal></para></listitem> + <listitem><para><literal>services/mail/dspam.nix</literal></para></listitem> + <listitem><para><literal>services/mail/opendkim.nix</literal></para></listitem> + <listitem><para><literal>services/mail/postsrsd.nix</literal></para></listitem> + <listitem><para><literal>services/mail/rspamd.nix</literal></para></listitem> + <listitem><para><literal>services/mail/rmilter.nix</literal></para></listitem> + <listitem><para><literal>services/misc/autofs.nix</literal></para></listitem> + <listitem><para><literal>services/misc/bepasty.nix</literal></para></listitem> + <listitem><para><literal>services/misc/calibre-server.nix</literal></para></listitem> + <listitem><para><literal>services/misc/cfdyndns.nix</literal></para></listitem> + <listitem><para><literal>services/misc/gammu-smsd.nix</literal></para></listitem> + <listitem><para><literal>services/misc/mathics.nix</literal></para></listitem> + <listitem><para><literal>services/misc/matrix-synapse.nix</literal></para></listitem> + <listitem><para><literal>services/misc/octoprint.nix</literal></para></listitem> + <listitem><para><literal>services/monitoring/hdaps.nix</literal></para></listitem> + <listitem><para><literal>services/monitoring/heapster.nix</literal></para></listitem> + <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem> + <listitem><para><literal>services/network-filesystems/netatalk.nix</literal></para></listitem> + <listitem><para><literal>services/network-filesystems/xtreemfs.nix</literal></para></listitem> + <listitem><para><literal>services/networking/autossh.nix</literal></para></listitem> + <listitem><para><literal>services/networking/dnschain.nix</literal></para></listitem> + <listitem><para><literal>services/networking/gale.nix</literal></para></listitem> + <listitem><para><literal>services/networking/miniupnpd.nix</literal></para></listitem> + <listitem><para><literal>services/networking/namecoind.nix</literal></para></listitem> + <listitem><para><literal>services/networking/ostinato.nix</literal></para></listitem> <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem> - <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem> + <listitem><para><literal>services/networking/shairport-sync.nix</literal></para></listitem> + <listitem><para><literal>services/networking/supplicant.nix</literal></para></listitem> + <listitem><para><literal>services/search/kibana.nix</literal></para></listitem> <listitem><para><literal>services/security/haka.nix</literal></para></listitem> - <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem> + <listitem><para><literal>services/security/physlock.nix</literal></para></listitem> + <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem> + <listitem><para><literal>services/x11/hardware/libinput.nix</literal></para></listitem> + <listitem><para><literal>services/x11/window-managers/windowlab.nix</literal></para></listitem> + <listitem><para><literal>system/boot/initrd-network.nix</literal></para></listitem> + <listitem><para><literal>system/boot/initrd-ssh.nix</literal></para></listitem> + <listitem><para><literal>system/boot/loader/loader.nix</literal></para></listitem> + <listitem><para><literal>system/boot/networkd.nix</literal></para></listitem> + <listitem><para><literal>system/boot/resolved.nix</literal></para></listitem> + <listitem><para><literal>virtualisation/lxd.nix</literal></para></listitem> + <listitem><para><literal>virtualisation/rkt.nix</literal></para></listitem> </itemizedlist> </para> @@ -114,7 +165,7 @@ following incompatible changes:</para> <programlisting><![CDATA[ { - imports = [ <nixos/modules/services/misc/gitit.nix> ]; + imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ]; } ]]></programlisting> @@ -297,7 +348,7 @@ $TTL 1800 <para> <literal>service.syncthing.dataDir</literal> options now has to point to exact folder where syncthing is writing to. Example configuration should - loook something like: + look something like: </para> <programlisting> services.syncthing = { |